Test fixes and rebase conflicts

diff --git a/src/librustc/metadata/creader.rs b/src/librustc/metadata/creader.rs
index 7d3d67df6d15768ee6e2bbd0cec72614c7eeffa2..29566fb1e7cd1f0cf5d13e3e7d2dd2f1d70d447e 100644 (file)
--- a/src/librustc/metadata/creader.rs
+++ b/src/librustc/metadata/creader.rs
@@ -180,7 +180,7 @@ pub fn validate_crate_name(sess: Option<&Session>, s: &str, sp: Option<Span>) {
     for c in s.chars() {
         if c.is_alphanumeric() { continue }
         if c == '_' || c == '-' { continue }
-        err(format!("invalid character in crate name: `{}`", c).as_slice());
+        err(format!("invalid character `{}` in crate name: `{}`", c, s).as_slice());
     }
     match sess {
         Some(sess) => sess.abort_if_errors(),

diff --git a/src/librustc/middle/trans/debuginfo.rs b/src/librustc/middle/trans/debuginfo.rs
index 0a8b844d2542e10af5383536f9f4642c3ba2e3ee..7eb3fcce7803fdd506c92d913c0e2487ec7ecf00 100644 (file)
--- a/src/librustc/middle/trans/debuginfo.rs
+++ b/src/librustc/middle/trans/debuginfo.rs
@@ -3972,7 +3972,7 @@ fn fill_nested(node: &NamespaceTreeNode, output: &mut String) {
 }
 
 fn crate_root_namespace<'a>(cx: &'a CrateContext) -> &'a str {
-    cx.link_meta.crateid.name.as_slice()
+    cx.link_meta.crate_name.as_slice()
 }
 
 fn namespace_for_item(cx: &CrateContext, def_id: ast::DefId) -> Rc<NamespaceTreeNode> {

diff --git a/src/test/run-make/issue-11908/Makefile b/src/test/run-make/issue-11908/Makefile
index 66f360daa1a335c0cf895027eda2f8e71a798f18..663a9f7125e705816f80ad38ed32dcd0d3022d95 100644 (file)
--- a/src/test/run-make/issue-11908/Makefile
+++ b/src/test/run-make/issue-11908/Makefile
@@ -10,12 +10,14 @@
 all:
        mkdir $(TMPDIR)/other
        $(RUSTC) foo.rs --crate-type=dylib
-       $(RUSTC) foo.rs --crate-type=dylib -o $(TMPDIR)/other/libfoo.so
+       mv $(call DYLIB,foo) $(TMPDIR)/other
+       $(RUSTC) foo.rs --crate-type=dylib
        $(RUSTC) bar.rs -L $(TMPDIR)/other 2>&1 | \
                grep "multiple dylib candidates"
        rm -rf $(TMPDIR)
        mkdir -p $(TMPDIR)/other
        $(RUSTC) foo.rs --crate-type=rlib
-       $(RUSTC) foo.rs --crate-type=rlib -o $(TMPDIR)/other/libfoo.rlib
+       mv $(TMPDIR)/libfoo.rlib $(TMPDIR)/other
+       $(RUSTC) foo.rs --crate-type=rlib
        $(RUSTC) bar.rs -L $(TMPDIR)/other 2>&1 | \
                grep "multiple rlib candidates"