---

yaml
---
r: 15721
b: refs/heads/try
c: 55de232
h: refs/heads/master
i:
  15719: 514877b
v: v3

Author: tychosci

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: f1129635ee5fc595c3638626884e49e6dd9356d9
+refs/heads/try: 55de232426b3861d1cc2385888a6104063318dce
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/etc/vim/syntax/rust.vim

@@ -15,11 +15,17 @@ if !exists("main_syntax")
 endif
 
 syn keyword   rustKeyword     alt as assert be bind break
-syn keyword   rustKeyword     check claim cont const copy do else enum export fail
-syn keyword   rustKeyword     fn for if iface impl import in inline lambda let log
+syn keyword   rustKeyword     check claim cont const copy do else export fail
+syn keyword   rustKeyword     for if impl import in inline lambda let log
 syn keyword   rustKeyword     loop mod mut mutable native note of prove pure
-syn keyword   rustKeyword     resource ret self syntax to type unchecked
+syn keyword   rustKeyword     ret self syntax to unchecked
 syn keyword   rustKeyword     unsafe use while with
+" FIXME: Scoped impl's name is also fallen in this category
+syn keyword   rustKeyword     mod iface resource class enum type nextgroup=rustIdentifier skipwhite
+syn keyword   rustKeyword     fn nextgroup=rustFuncName skipwhite
+
+syn match     rustIdentifier  "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
+syn match     rustFuncName    "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
 
 " Reserved words
 syn keyword   rustKeyword     m32 m64 m128 f80 f16 f128 class trait
@@ -59,6 +65,8 @@ hi def link rustNumber        Number
 hi def link rustBoolean       Boolean
 hi def link rustFloat         Float
 hi def link rustKeyword       Keyword
+hi def link rustIdentifier    Identifier
+hi def link rustFuncName      Function
 hi def link rustComment       Comment
 hi def link rustMacro         Macro
 hi def link rustType          Type

branches/try/src/libcore/ptr.rs

@@ -104,10 +104,10 @@ unsafe fn memmove<T>(dst: *T, src: *T, count: uint)  {
 #[doc = "Extension methods for pointers"]
 impl extensions<T> for *T {
     #[doc = "Returns true if the pointer is equal to the null pointer."]
-    pure fn is_null() -> bool { is_null(self) }
+    pure fn is_null<T>() -> bool { is_null(self) }
 
     #[doc = "Returns true if the pointer is not equal to the null pointer."]
-    pure fn is_not_null() -> bool { is_not_null(self) }
+    pure fn is_not_null<T>() -> bool { is_not_null(self) }
 }
 
 #[test]

branches/try/src/rustc/middle/typeck.rs

@@ -2738,25 +2738,6 @@ impl methods for lookup {
                     self.tcx().sess.span_err(
                         self.expr.span,
                         "multiple applicable methods in scope");
-
-                    // I would like to print out how each impl was imported,
-                    // but I cannot for the life of me figure out how to
-                    // annotate resolve to preserve this information.
-                    for results.eachi { |i, result|
-                        let (_, _, did) = result;
-                        let span = if did.crate == ast::local_crate {
-                            alt check self.tcx().items.get(did.node) {
-                              ast_map::node_method(m, _, _) { m.span }
-                            }
-                        } else {
-                            self.expr.span
-                        };
-                        self.tcx().sess.span_note(
-                            span,
-                            #fmt["candidate #%u is %s",
-                                 (i+1u),
-                                 ty::item_path_str(self.tcx(), did)]);
-                    }
                 }
 
                 let (self_substs, n_tps, did) = results[0];