File tree Expand file tree Collapse file tree 2 files changed +4
-5
lines changed Expand file tree Collapse file tree 2 files changed +4
-5
lines changed Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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) ) ;
You can’t perform that action at this time.
0 commit comments