File tree Expand file tree Collapse file tree 3 files changed +5
-6
lines changed Expand file tree Collapse file tree 3 files changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
5
5
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8
- refs/heads/try2: af3cde2c9760fa3efc061c9e64e17f0aa8b355ff
8
+ refs/heads/try2: 4f151b388bc55731aa7493ae712e13740aff2380
9
9
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
10
10
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
11
11
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
Original file line number Diff line number Diff line change @@ -607,8 +607,8 @@ pub fn build_link_meta(sess: Session,
607
607
fn crate_meta_name ( sess : Session , output : & Path , opt_name : Option < @str > )
608
608
-> @str {
609
609
match opt_name {
610
- Some ( v) => v,
611
- None => {
610
+ Some ( v) if !v . is_empty ( ) => v,
611
+ _ => {
612
612
// to_managed could go away if there was a version of
613
613
// filestem that returned an @str
614
614
let name = session:: expect ( sess,
@@ -624,8 +624,8 @@ pub fn build_link_meta(sess: Session,
624
624
625
625
fn crate_meta_vers ( sess : Session , opt_vers : Option < @str > ) -> @str {
626
626
match opt_vers {
627
- Some ( v) => v,
628
- None => {
627
+ Some ( v) if !v . is_empty ( ) => v,
628
+ _ => {
629
629
let vers = @"0.0 ";
630
630
warn_missing ( sess, "vers" , vers) ;
631
631
vers
Original file line number Diff line number Diff line change @@ -319,7 +319,6 @@ pub fn require_unique_names(diagnostic: @mut span_handler,
319
319
for meta in metas. iter ( ) {
320
320
let name = meta. name ( ) ;
321
321
322
- // FIXME: How do I silence the warnings? --pcw (#2619)
323
322
if !set. insert ( name) {
324
323
diagnostic. span_fatal ( meta. span ,
325
324
fmt ! ( "duplicate meta item `%s`" , name) ) ;
You can’t perform that action at this time.
0 commit comments