---

brson · brson · commit 4750c965cc63 · 2012-09-21T19:26:31.000-07:00
yaml --- r: 30691 b: refs/heads/incoming c: 60a1497 h: refs/heads/master i: 30689: 28f1575 30687: 7c7140d v: v3
diff --git a/[refs] b/[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: 3d59ac3a1989c2d233b04cc8adc9b058690c2544
+refs/heads/incoming: 60a1497ebb3e0208ca1c5291934666815d66e029
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/rustc/middle/resolve.rs b/branches/incoming/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`	`}`