From 0c5b3c9d2a37143cf040f35d465c9d16673edd3d Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Fri, 11 Jul 2014 14:12:40 -0700 Subject: [PATCH] Always check #[crate_name] attribute Otherwise we get an unused attribute warning when the crate name is set via the command line. --- src/librustc/back/link.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs index e2264088b4a84..17fcc6ef3da3e 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs @@ -555,6 +555,10 @@ pub fn find_crate_name(sess: Option<&Session>, s }; + // Do this first to mark #[crate_name] even if one is specified via args + let attr_crate_name = attrs.iter().find(|at| at.check_name("crate_name")) + .and_then(|at| at.value_str().map(|s| (at, s))); + match sess { Some(sess) => { match sess.opts.crate_name { @@ -565,9 +569,7 @@ pub fn find_crate_name(sess: Option<&Session>, None => {} } - let crate_name = attrs.iter().find(|at| at.check_name("crate_name")) - .and_then(|at| at.value_str().map(|s| (at, s))); - match crate_name { + match attr_crate_name { Some((attr, s)) => return validate(s.get().to_string(), Some(attr.span)), None => {} }