Skip to content

Commit

Permalink
auto merge of #8933 : luqmana/rust/ot, r=pnkfelix
Browse files Browse the repository at this point in the history
Fixes #6540. Also remove a fixme for #2619 since it's not relevant anymore.
  • Loading branch information
bors committed Sep 2, 2013
2 parents 7ff102a + 462604a commit fc9fa2c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/librustc/back/link.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/libsyntax/attr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit fc9fa2c

Please sign in to comment.