---

yaml
---
r: 4606
b: refs/heads/master
c: c06d95f
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e790f1e6c5b63a4a5174d1a37f381e14ef285396
+refs/heads/master: c06d95f1788f7c3b708f0be1fc452c35abf03841

trunk/src/test/compile-fail/cross-crate-glob-collision.rs

@@ -1,13 +1,13 @@
-// error-pattern:'swap' is glob-imported from multiple different modules
+// error-pattern:'member' is glob-imported from multiple different modules
 // issue #482
 
 use std;
 // expecting swap to be defined in vec
-import std::vec::*;
+import std::ivec::*;
 import alternate_supplier::*;
 
 mod alternate_supplier {
-    fn swap() { }
+    fn member() { }
 }
 
-fn main() { swap() }
+fn main() { member() }