---

yaml
---
r: 192995
b: refs/heads/beta
c: a194519
h: refs/heads/master
i:
  192993: 16d61aa
  192991: 5a1d9bc
v: v3

Author: flaper87

[refs]

@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: 3ebdbac2651cd21f2efda8d3b381ed396d7bb725
+refs/heads/beta: a1945197c32d4e81b9fa30e61f3544a484b5491a
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: de8a23bbc3a7b9cbd7574b5b91a34af59bf030e6

branches/beta/src/librustc_typeck/astconv.rs

@@ -1849,12 +1849,12 @@ pub fn partition_bounds<'a>(tcx: &ty::ctxt,
                                                      &mut builtin_bounds) {
                             let segments = &b.trait_ref.path.segments;
                             let parameters = &segments[segments.len() - 1].parameters;
-                            if parameters.is_empty() {
-                                continue; // success
+                            if !parameters.is_empty() {
+                                span_err!(tcx.sess, b.trait_ref.path.span, E0316,
+                                          "builtin bounds do not require arguments, {} given",
+                                          parameters.lifetimes().len() + parameters.types().len());
                             }
-                            span_err!(tcx.sess, b.trait_ref.path.span, E0316,
-                                      "builtin bounds do not require arguments, {} given",
-                                      parameters.types().len());
+                            continue; // success
                         }
                     }
                     _ => {

branches/beta/src/libtest/stats.rs

@@ -332,6 +332,7 @@ pub fn winsorize<T: Float + FromPrimitive>(samples: &mut [T], pct: T) {
 
 /// Returns a HashMap with the number of occurrences of every element in the
 /// sequence that the iterator exposes.
+#[cfg(not(stage0))]
 pub fn freq_count<T, U>(iter: T) -> hash_map::HashMap<U, uint>
   where T: Iterator<Item=U>, U: Eq + Clone + Hash
 {

branches/beta/src/test/compile-fail/typeck-builtin-bound-type-parameters.rs

@@ -15,13 +15,13 @@ trait Trait: Copy<Send> {}
 //~^ ERROR: builtin bounds do not require arguments, 1 given
 
 struct MyStruct1<T: Copy<T>>;
-//~^ ERROR: builtin bounds do not require arguments, 1 given
+//~^ ERROR builtin bounds do not require arguments, 1 given
 
 struct MyStruct2<'a, T: Copy<'a>>;
 //~^ ERROR: builtin bounds do not require arguments, 1 given
 
 fn foo2<'a, T:Copy<'a, U>, U>(x: T) {}
-//~^ ERROR: builtin bounds do not require arguments, 1 given
+//~^ ERROR builtin bounds do not require arguments, 2 given
 
 fn main() {
 }