diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-07-03 07:43:12 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-07-05 12:46:42 -0700 |
| commit | 15b680ae86eefae754c3a348d89207fa100b4ca6 (patch) | |
| tree | e122fdf0d5e946c2769a598568918d9cbe7cac19 | |
| parent | 41ed455db8cbde3cfff0d72e0ae383c20721b27a (diff) | |
| download | rust-15b680ae86eefae754c3a348d89207fa100b4ca6.tar.gz rust-15b680ae86eefae754c3a348d89207fa100b4ca6.zip | |
Test fixes and rebase conflicts
| -rw-r--r-- | src/librustc/metadata/creader.rs | 2 | ||||
| -rw-r--r-- | src/librustc/middle/trans/debuginfo.rs | 2 | ||||
| -rw-r--r-- | src/test/run-make/issue-11908/Makefile | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/librustc/metadata/creader.rs b/src/librustc/metadata/creader.rs index 7d3d67df6d1..29566fb1e7c 100644 --- 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 0a8b844d254..7eb3fcce780 100644 --- a/src/librustc/middle/trans/debuginfo.rs +++ b/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> { diff --git a/src/test/run-make/issue-11908/Makefile b/src/test/run-make/issue-11908/Makefile index 66f360daa1a..663a9f7125e 100644 --- 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" |