---

luqmana · luqmana · commit 44738fc73f0c · 2013-02-17T21:53:29.000-05:00
yaml --- r: 47761 b: refs/heads/incoming c: 5b5ac33 h: refs/heads/master i: 47759: ad059c2 v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 0f09c106f00d774a6e59b1245edcc536cc2bf459
+refs/heads/incoming: 5b5ac331db98bdcf74124e7b55309501e080146d
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 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
@@ -1463,7 +1463,8 @@ pub impl Resolver {
             }
 
             view_item_extern_mod(name, _, node_id) => {
-                match find_extern_mod_stmt_cnum(self.session.cstore, node_id) {
+                match find_extern_mod_stmt_cnum(self.session.cstore,
+                                                node_id) {
                     Some(crate_id) => {
                         let (child_name_bindings, new_parent) =
                             self.add_child(name, parent, ForbidDuplicateTypes,

Original file line number	Diff line number	Diff line change
`@@ -1463,7 +1463,8 @@ pub impl Resolver {`
`1463`	`1463`	`}`
`1464`	`1464`
`1465`	`1465`	`view_item_extern_mod(name, _, node_id) => {`
`1466`		`- match find_extern_mod_stmt_cnum(self.session.cstore, node_id) {`
	`1466`	`+ match find_extern_mod_stmt_cnum(self.session.cstore,`
	`1467`	`+ node_id) {`
`1467`	`1468`	`Some(crate_id) => {`
`1468`	`1469`	`let (child_name_bindings, new_parent) =`
`1469`	`1470`	`self.add_child(name, parent, ForbidDuplicateTypes,`