about summary refs log tree commit diff
path: root/src/Makefile
diff options
context:
space:
mode:
authorRafael Ávila de Espíndola <respindola@mozilla.com>2011-01-14 17:20:14 -0500
committerRafael Ávila de Espíndola <respindola@mozilla.com>2011-01-14 17:34:00 -0500
commit5b9eda4a41a410ffd8529a80c19f499ff856e07f (patch)
tree8643c5269b17344e41e66f1ee7658c39ebc2aa7d /src/Makefile
parentc8a2c44a8e67d05204bac2850852f7fec0d23332 (diff)
downloadrust-5b9eda4a41a410ffd8529a80c19f499ff856e07f.tar.gz
rust-5b9eda4a41a410ffd8529a80c19f499ff856e07f.zip
Fix the import handling in "complex" cases. When looking a.b.c and 'a' is a
module, we should look for 'b' *just* in the module 'a' and then continue
resolving b.c in the environment created by updating *with* a.

Still not 100% correct, but getting there.
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile
index 6bb40a98d4b..bf7570675f6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -447,6 +447,7 @@ TEST_XFAILS_RUSTC := $(filter-out \
                         import3.rs \
                         import4.rs \
                         import5.rs \
+                        import6.rs \
                         item-name-overload.rs \
                         large-records.rs \
                         lazy-init.rs \