---

gareth · gareth · commit 27ea39d46a32 · 2012-12-29T11:44:02.000Z
yaml --- r: 39633 b: refs/heads/incoming c: d68954e h: refs/heads/master i: 39631: ed0e000 v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: b6aafe928dbae9e610486105c2a3ec1d2fe2070e
+refs/heads/incoming: d68954efa09c4cbd16a07d4bd93de688d64074c3
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/librustc/middle/resolve.rs b/branches/incoming/src/librustc/middle/resolve.rs
@@ -2120,15 +2120,15 @@ impl Resolver {
         // XXX: Shouldn't copy here. We need string builder functionality.
         return result;
     }
-    
+
     fn import_directive_subclass_to_str(subclass: ImportDirectiveSubclass)
                                                                      -> ~str {
         match subclass {
             SingleImport(_target, source, _ns) => self.session.str_of(source),
             GlobImport => ~"*"
         }
     }
-    
+
     fn import_path_to_str(idents: ~[ident], subclass: ImportDirectiveSubclass)
                                                                      -> ~str {
         if idents.is_empty() {
@@ -2139,7 +2139,7 @@ impl Resolver {
                  self.import_directive_subclass_to_str(subclass))
         }
     }
-    
+
     /**
      * Attempts to resolve the given import. The return value indicates
      * failure if we're certain the name does not exist, indeterminate if we

Original file line number	Diff line number	Diff line change
`@@ -2120,15 +2120,15 @@ impl Resolver {`
`2120`	`2120`	`// XXX: Shouldn't copy here. We need string builder functionality.`
`2121`	`2121`	`return result;`
`2122`	`2122`	`}`
`2123`		`-`
	`2123`	`+`
`2124`	`2124`	`fn import_directive_subclass_to_str(subclass: ImportDirectiveSubclass)`
`2125`	`2125`	`-> ~str {`
`2126`	`2126`	`match subclass {`
`2127`	`2127`	`SingleImport(_target, source, _ns) => self.session.str_of(source),`
`2128`	`2128`	`GlobImport => ~"*"`
`2129`	`2129`	`}`
`2130`	`2130`	`}`
`2131`		`-`
	`2131`	`+`
`2132`	`2132`	`fn import_path_to_str(idents: ~[ident], subclass: ImportDirectiveSubclass)`
`2133`	`2133`	`-> ~str {`
`2134`	`2134`	`if idents.is_empty() {`
`@@ -2139,7 +2139,7 @@ impl Resolver {`
`2139`	`2139`	`self.import_directive_subclass_to_str(subclass))`
`2140`	`2140`	`}`
`2141`	`2141`	`}`
`2142`		`-`
	`2142`	`+`
`2143`	`2143`	`/**`
`2144`	`2144`	`* Attempts to resolve the given import. The return value indicates`
`2145`	`2145`	`* failure if we're certain the name does not exist, indeterminate if we`