auto merge of #8933 : luqmana/rust/ot, r=pnkfelix
Fixes #6540. Also remove a fixme for #2619 since it's not relevant anymore.
This commit is contained in:
commit
fc9fa2cb6c
@ -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
|
||||
|
@ -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));
|
||||
|
Loading…
x
Reference in New Issue
Block a user