---

yaml
---
r: 187243
b: refs/heads/try
c: a194519
h: refs/heads/master
i:
  187241: 93d9b91
  187239: c458c19
v: v3

Author: flaper87

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: b4c965ee803a4521d8b4575f634e036f93e408f3
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 3a96d6a9818fe2affc98a187fb1065120458cee9
-refs/heads/try: 3ebdbac2651cd21f2efda8d3b381ed396d7bb725
+refs/heads/try: a1945197c32d4e81b9fa30e61f3544a484b5491a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/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/try/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/try/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() {
 }