---

brson · brson · commit 4fdac0eb2ad9 · 2012-09-21T19:26:31.000-07:00
yaml --- r: 21983 b: refs/heads/snap-stage3 c: 60a1497 h: refs/heads/master i: 21981: 4a5f5e4 21979: 7e28edd 21975: eee3fb4 21967: fc5dc12 21951: 1e3c60b v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 3d59ac3a1989c2d233b04cc8adc9b058690c2544
+refs/heads/snap-stage3: 60a1497ebb3e0208ca1c5291934666815d66e029
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/rustc/middle/resolve.rs b/branches/snap-stage3/src/rustc/middle/resolve.rs
@@ -4204,7 +4204,7 @@ impl Resolver {
         match containing_module.children.find(name) {
             Some(child_name_bindings) => {
                 match (*child_name_bindings).def_for_namespace(namespace) {
-                    Some(def) if def.privacy == Public => {
+                    Some(def) if def.privacy == Public || xray == Xray => {
                         // Found it. Stop the search here.
                         return ChildNameDefinition(def.def);
                     }

Original file line number	Diff line number	Diff line change
`@@ -4204,7 +4204,7 @@ impl Resolver {`
`4204`	`4204`	`match containing_module.children.find(name) {`
`4205`	`4205`	`Some(child_name_bindings) => {`
`4206`	`4206`	`match (*child_name_bindings).def_for_namespace(namespace) {`
`4207`		`- Some(def) if def.privacy == Public => {`
	`4207`	`+ Some(def) if def.privacy == Public \|\| xray == Xray => {`
`4208`	`4208`	`// Found it. Stop the search here.`
`4209`	`4209`	`return ChildNameDefinition(def.def);`
`4210`	`4210`	`}`