---

yaml
---
r: 11958
b: refs/heads/master
c: d6ded67
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 38ac87f0ff3e8a55b697cc0f23ba9304afe72aa3
+refs/heads/master: d6ded6788dbf24a6545f579a23a92553efae1c2e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libcore/vec.rs

@@ -430,7 +430,7 @@ Apply a function to each element of a vector and return the results
 If function `f` returns `none` then that element is excluded from
 the resulting vector.
 "]
-fn filter_map<T: copy, U: copy>(v: [T], f: fn(T) -> option<U>)
+fn filter_map<T, U: copy>(v: [T], f: fn(T) -> option<U>)
     -> [U] {
     let mut result = [];
     for elem: T in v {

trunk/src/rustc/driver/rustc.rs

@@ -93,7 +93,7 @@ fn run_compiler(args: [str], demitter: diagnostic::emitter) {
         ret;
     }
     let ifile = alt vec::len(match.free) {
-      0u { early_error(demitter, "no input filename given") }
+      0u { early_error(demitter, "o input filename given") }
       1u { match.free[0] }
       _ { early_error(demitter, "multiple input filenames provided") }
     };