---

yaml
---
r: 30503
b: refs/heads/incoming
c: 7568dd4
h: refs/heads/master
i:
  30501: 4472085
  30499: 591f4df
  30495: ab210b5
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 7eb10c4ce113f37ddd418b95629480f5d1ad9b6a
+refs/heads/incoming: 7568dd4564d417d6d03801934b0c9163d3566a8b
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/compiletest/compiletest.rs

@@ -174,7 +174,7 @@ fn make_test(config: config, testfile: &Path) ->
    test::TestDesc {
     {
         name: make_test_name(config, testfile),
-        fn: make_test_closure(config, testfile),
+        testfn: make_test_closure(config, testfile),
         ignore: header::is_test_ignored(config, testfile),
         should_fail: false
     }

branches/incoming/src/libstd/test.rs

@@ -45,7 +45,7 @@ type TestFn = fn~();
 // these.
 type TestDesc = {
     name: TestName,
-    fn: TestFn,
+    testfn: TestFn,
     ignore: bool,
     should_fail: bool
 };
@@ -238,14 +238,14 @@ fn should_sort_failures_before_printing_them() {
 
     let test_a = {
         name: ~"a",
-        fn: fn~() { },
+        testfn: fn~() { },
         ignore: false,
         should_fail: false
     };
 
     let test_b = {
         name: ~"b",
-        fn: fn~() { },
+        testfn: fn~() { },
         ignore: false,
         should_fail: false
     };
@@ -367,7 +367,7 @@ fn filter_tests(opts: TestOpts,
         fn filter(test: TestDesc) -> Option<TestDesc> {
             if test.ignore {
                 return option::Some({name: test.name,
-                                  fn: copy test.fn,
+                                  testfn: copy test.testfn,
                                   ignore: false,
                                   should_fail: test.should_fail});
             } else { return option::None; }
@@ -396,7 +396,7 @@ fn run_test(+test: TestDesc, monitor_ch: comm::Chan<MonitorMsg>) {
     }
 
     do task::spawn |move test| {
-        let testfn = copy test.fn;
+        let testfn = copy test.testfn;
         let mut result_future = None; // task::future_result(builder);
         task::task().unlinked().future_result(|+r| {
             result_future = Some(move r);
@@ -425,7 +425,7 @@ mod tests {
         fn f() { fail; }
         let desc = {
             name: ~"whatever",
-            fn: f,
+            testfn: f,
             ignore: true,
             should_fail: false
         };
@@ -441,7 +441,7 @@ mod tests {
         fn f() { }
         let desc = {
             name: ~"whatever",
-            fn: f,
+            testfn: f,
             ignore: true,
             should_fail: false
         };
@@ -458,7 +458,7 @@ mod tests {
         fn f() { fail; }
         let desc = {
             name: ~"whatever",
-            fn: f,
+            testfn: f,
             ignore: false,
             should_fail: true
         };
@@ -474,7 +474,7 @@ mod tests {
         fn f() { }
         let desc = {
             name: ~"whatever",
-            fn: f,
+            testfn: f,
             ignore: false,
             should_fail: true
         };
@@ -513,8 +513,10 @@ mod tests {
         let opts = {filter: option::None, run_ignored: true,
             logfile: option::None};
         let tests =
-            ~[{name: ~"1", fn: fn~() { }, ignore: true, should_fail: false},
-             {name: ~"2", fn: fn~() { }, ignore: false, should_fail: false}];
+            ~[{name: ~"1", testfn: fn~() { },
+               ignore: true, should_fail: false},
+             {name: ~"2", testfn: fn~() { },
+              ignore: false, should_fail: false}];
         let filtered = filter_tests(opts, tests);
 
         assert (vec::len(filtered) == 1u);
@@ -539,7 +541,7 @@ mod tests {
         let testfn = fn~() { };
         let mut tests = ~[];
             for vec::each(names) |name| {
-            let test = {name: name, fn: copy testfn, ignore: false,
+            let test = {name: name, testfn: copy testfn, ignore: false,
                         should_fail: false};
             tests += ~[test];
         }

branches/incoming/src/libsyntax/parse/parser.rs

@@ -2329,7 +2329,9 @@ impl parser {
                           | ~"owned" => {
                             self.obsolete(copy self.span,
                                           ObsoleteLowerCaseKindBounds);
-                            None
+                            // Bogus value, but doesn't matter, since
+                            // is an error
+                            Some(bound_send)
                           }
 
                           _ => None

branches/incoming/src/libsyntax/parse/token.rs

@@ -414,8 +414,7 @@ fn temporary_keyword_table() -> HashMap<~str, ()> {
 fn restricted_keyword_table() -> HashMap<~str, ()> {
     let words = str_hash();
     let keys = ~[
-        ~"const", ~"copy",
-        ~"fail", ~"fn",
+        ~"fail",
         ~"unsafe"
     ];
     for keys.each |word| {
@@ -430,9 +429,10 @@ fn strict_keyword_table() -> HashMap<~str, ()> {
     let keys = ~[
         ~"as", ~"assert",
         ~"break",
+        ~"const", ~"copy",
         ~"do", ~"drop",
         ~"else", ~"enum", ~"export", ~"extern",
-        ~"false", ~"for",
+        ~"false", ~"fn", ~"for",
         ~"if", ~"impl",
         ~"let", ~"log", ~"loop",
         ~"match", ~"mod", ~"move", ~"mut",

branches/incoming/src/rustc/front/test.rs

@@ -335,7 +335,7 @@ fn mk_test_desc_rec(cx: test_ctxt, test: test) -> @ast::expr {
     let fn_wrapper_expr = mk_test_wrapper(cx, fn_expr, span);
 
     let fn_field: ast::field =
-        nospan({mutbl: ast::m_imm, ident: cx.sess.ident_of(~"fn"),
+        nospan({mutbl: ast::m_imm, ident: cx.sess.ident_of(~"testfn"),
                 expr: fn_wrapper_expr});
 
     let ignore_lit: ast::lit = nospan(ast::lit_bool(test.ignore));