Accept crate name instead of attributes in build_output_filenames

Author: bjorn3

compiler/rustc_attr/src/builtin.rs

@@ -492,10 +492,6 @@ fn parse_unstability(sess: &Session, attr: &Attribute) -> Option<(Symbol, Stabil
  }
 }
 
-pub fn find_crate_name(attrs: &[Attribute]) -> Option<Symbol> {
- attr::first_attr_value_str_by_name(attrs, sym::crate_name)
-}
-
 #[derive(Clone, Debug)]
 pub struct Condition {
  pub name: Symbol,

compiler/rustc_driver_impl/src/lib.rs

@@ -765,8 +765,8 @@ fn print_crate_info(
  // no crate attributes, print out an error and exit
  return Compilation::Continue;
  };
- let t_outputs = rustc_interface::util::build_output_filenames(attrs, sess);
  let id = rustc_session::output::find_crate_name(sess, attrs);
+ let t_outputs = rustc_interface::util::build_output_filenames(sess, id.to_string());
  let crate_types = collect_crate_types(sess, attrs);
  for &style in &crate_types {
  let fname =

compiler/rustc_interface/src/interface.rs

@@ -49,7 +49,10 @@ impl Compiler {
  sess: &Session,
  attrs: &[ast::Attribute],
  ) -> OutputFilenames {
- util::build_output_filenames(attrs, sess)
+ util::build_output_filenames(
+ sess,
+ rustc_session::output::find_crate_name(sess, attrs).to_string(),
+ )
  }
 }
 

compiler/rustc_interface/src/passes.rs

@@ -556,10 +556,9 @@ fn resolver_for_lowering<'tcx>(
 fn output_filenames(tcx: TyCtxt<'_>, (): ()) -> Arc<OutputFilenames> {
  let sess = tcx.sess;
  let _timer = sess.timer("prepare_outputs");
- let (_, krate) = &*tcx.resolver_for_lowering(()).borrow();
  let crate_name = tcx.crate_name(LOCAL_CRATE);
 
- let outputs = util::build_output_filenames(&krate.attrs, sess);
+ let outputs = util::build_output_filenames(sess, crate_name.to_string());
  let output_paths =
  generated_output_paths(tcx, &outputs, sess.io.output_file.is_some(), crate_name);
 

compiler/rustc_interface/src/util.rs

@@ -471,20 +471,14 @@ fn multiple_output_types_to_stdout(
  }
 }
 
-pub fn build_output_filenames(attrs: &[ast::Attribute], sess: &Session) -> OutputFilenames {
+pub fn build_output_filenames(sess: &Session, crate_name: String) -> OutputFilenames {
  if multiple_output_types_to_stdout(
  &sess.opts.output_types,
  sess.io.output_file == Some(OutFileName::Stdout),
  ) {
  sess.emit_fatal(errors::MultipleOutputTypesToStdout);
  }
 
- let crate_name = sess
- .opts
- .crate_name
- .clone()
- .or_else(|| rustc_attr::find_crate_name(attrs).map(|n| n.to_string()));
-
  match sess.io.output_file {
  None => {
  // "-" as input file will cause the parser to read from stdin so we
@@ -493,11 +487,11 @@ pub fn build_output_filenames(attrs: &[ast::Attribute], sess: &Session) -> Outpu
  let dirpath = sess.io.output_dir.clone().unwrap_or_default();
 
  // If a crate name is present, we use it as the link name
- let stem = crate_name.clone().unwrap_or_else(|| sess.io.input.filestem().to_owned());
+ let stem = crate_name.clone();
 
  OutputFilenames::new(
  dirpath,
- crate_name.unwrap_or_else(|| stem.replace('-', "_")),
+ crate_name,
  stem,
  None,
  sess.io.temps_dir.clone(),
@@ -526,7 +520,7 @@ pub fn build_output_filenames(attrs: &[ast::Attribute], sess: &Session) -> Outpu
  out_file.filestem().unwrap_or_default().to_str().unwrap().to_string();
  OutputFilenames::new(
  out_file.parent().unwrap_or_else(|| Path::new("")).to_path_buf(),
- crate_name.unwrap_or_else(|| out_filestem.replace('-', "_")),
+ crate_name,
  out_filestem,
  ofile,
  sess.io.temps_dir.clone(),