From 2a14979dc7d2a8efa7146de5295588d6c6f4772b Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Sun, 19 Apr 2020 09:15:04 -0700 Subject: [PATCH] Rename allows_underscores to allows_dashes. --- src/cargo/core/compiler/context/compilation_files.rs | 2 +- src/cargo/core/compiler/mod.rs | 2 +- src/cargo/core/manifest.rs | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/cargo/core/compiler/context/compilation_files.rs b/src/cargo/core/compiler/context/compilation_files.rs index 56b3c3c615b..ea643bb33c5 100644 --- a/src/cargo/core/compiler/context/compilation_files.rs +++ b/src/cargo/core/compiler/context/compilation_files.rs @@ -305,7 +305,7 @@ impl<'a, 'cfg: 'a> CompilationFiles<'a, 'cfg> { /// Returns the bin filename for a given target, without extension and metadata. fn bin_stem(&self, unit: &Unit<'_>) -> String { - if unit.target.allows_underscores() { + if unit.target.allows_dashes() { unit.target.name().to_string() } else { unit.target.crate_name() diff --git a/src/cargo/core/compiler/mod.rs b/src/cargo/core/compiler/mod.rs index faee6e570d9..7c2efa7ee7a 100644 --- a/src/cargo/core/compiler/mod.rs +++ b/src/cargo/core/compiler/mod.rs @@ -193,7 +193,7 @@ fn rustc<'a, 'cfg>( // don't pass the `-l` flags. let pass_l_flag = unit.target.is_lib() || !unit.pkg.targets().iter().any(|t| t.is_lib()); let pass_cdylib_link_args = unit.target.is_cdylib(); - let do_rename = unit.target.allows_underscores() && !unit.mode.is_any_test(); + let do_rename = unit.target.allows_dashes() && !unit.mode.is_any_test(); let real_name = unit.target.name().to_string(); let crate_name = unit.target.crate_name(); diff --git a/src/cargo/core/manifest.rs b/src/cargo/core/manifest.rs index 27f5b62fe3a..774e13af516 100644 --- a/src/cargo/core/manifest.rs +++ b/src/cargo/core/manifest.rs @@ -792,7 +792,11 @@ impl Target { } } - pub fn allows_underscores(&self) -> bool { + /// Whether or not this target allows dashes in its filename. + /// + /// Rustc will always emit filenames with underscores, and Cargo will + /// rename them back to dashes if this is true. + pub fn allows_dashes(&self) -> bool { self.is_bin() || self.is_example() || self.is_custom_build() }