---

yaml
---
r: 131583
b: refs/heads/dist-snap
c: 15b680a
h: refs/heads/master
i:
  131581: 6013e16
  131579: c0cd60e
  131575: 26d6ed3
  131567: e2acc61
  131551: da44a61
  131519: d656def
  131455: f1f7b43
  131327: 6d566ed
  131071: 126dbf5
v: v3

Author: alexcrichton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 457a3c991d79b971be07fce75f9d0c12848fb37c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 41ed455db8cbde3cfff0d72e0ae383c20721b27a
+refs/heads/dist-snap: 15b680ae86eefae754c3a348d89207fa100b4ca6
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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(),

branches/dist-snap/src/librustc/middle/trans/debuginfo.rs

@@ -3972,7 +3972,7 @@ impl NamespaceTreeNode {
 }
 
 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> {

branches/dist-snap/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"