diff options
| -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)); |