Skip to content

Commit 1bb312d

Browse files
committed
---
yaml --- r: 144638 b: refs/heads/try2 c: 4f151b3 h: refs/heads/master v: v3
1 parent 63e9c94 commit 1bb312d

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: af3cde2c9760fa3efc061c9e64e17f0aa8b355ff
8+
refs/heads/try2: 4f151b388bc55731aa7493ae712e13740aff2380
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/back/link.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -607,8 +607,8 @@ pub fn build_link_meta(sess: Session,
607607
fn crate_meta_name(sess: Session, output: &Path, opt_name: Option<@str>)
608608
-> @str {
609609
match opt_name {
610-
Some(v) => v,
611-
None => {
610+
Some(v) if !v.is_empty() => v,
611+
_ => {
612612
// to_managed could go away if there was a version of
613613
// filestem that returned an @str
614614
let name = session::expect(sess,
@@ -624,8 +624,8 @@ pub fn build_link_meta(sess: Session,
624624

625625
fn crate_meta_vers(sess: Session, opt_vers: Option<@str>) -> @str {
626626
match opt_vers {
627-
Some(v) => v,
628-
None => {
627+
Some(v) if !v.is_empty() => v,
628+
_ => {
629629
let vers = @"0.0";
630630
warn_missing(sess, "vers", vers);
631631
vers

branches/try2/src/libsyntax/attr.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@ pub fn require_unique_names(diagnostic: @mut span_handler,
319319
for meta in metas.iter() {
320320
let name = meta.name();
321321

322-
// FIXME: How do I silence the warnings? --pcw (#2619)
323322
if !set.insert(name) {
324323
diagnostic.span_fatal(meta.span,
325324
fmt!("duplicate meta item `%s`", name));

0 commit comments

Comments
 (0)