diff options
| author | bors <bors@rust-lang.org> | 2013-09-02 13:10:48 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-02 13:10:48 -0700 |
| commit | fc9fa2cb6ca2b0979137134713fe3f693090a9d9 (patch) | |
| tree | 75c1eebaea2090e26f429eb094e49d8f0d85903a | |
| parent | 7ff102a685de250eeecc77eb8a6d82cd25c1d8a5 (diff) | |
| parent | 462604ace114458d388ba1f14dd0fe95c25210be (diff) | |
| download | rust-fc9fa2cb6ca2b0979137134713fe3f693090a9d9.tar.gz rust-fc9fa2cb6ca2b0979137134713fe3f693090a9d9.zip | |
auto merge of #8933 : luqmana/rust/ot, r=pnkfelix
Fixes #6540. Also remove a fixme for #2619 since it's not relevant anymore.
| -rw-r--r-- | src/librustc/back/link.rs | 8 | ||||
| -rw-r--r-- | src/libsyntax/attr.rs | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs index 91666966949..64fa25fde20 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs @@ -607,8 +607,8 @@ pub fn build_link_meta(sess: Session, fn crate_meta_name(sess: Session, output: &Path, opt_name: Option<@str>) -> @str { match opt_name { - Some(v) => v, - None => { + Some(v) if !v.is_empty() => v, + _ => { // to_managed could go away if there was a version of // filestem that returned an @str let name = session::expect(sess, @@ -624,8 +624,8 @@ pub fn build_link_meta(sess: Session, fn crate_meta_vers(sess: Session, opt_vers: Option<@str>) -> @str { match opt_vers { - Some(v) => v, - None => { + Some(v) if !v.is_empty() => v, + _ => { let vers = @"0.0"; warn_missing(sess, "vers", vers); vers diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs index d365c89eee7..2ed03040fa1 100644 --- a/src/libsyntax/attr.rs +++ b/src/libsyntax/attr.rs @@ -319,7 +319,6 @@ pub fn require_unique_names(diagnostic: @mut span_handler, for meta in metas.iter() { let name = meta.name(); - // FIXME: How do I silence the warnings? --pcw (#2619) if !set.insert(name) { diagnostic.span_fatal(meta.span, fmt!("duplicate meta item `%s`", name)); |