bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename some target_cfg variables as target.

Browse source 
Because the underlying type is called `Target`. (There is also a
separate type called `TargetCfg`.)
This commit is contained in:
Nicholas Nethercote 2024-03-21 11:40:13 +11:00
parent 23ee523ea6
commit 5744be2727
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_interface/src/tests.rs
View file

@ -41,7 +41,7 @@ fn mk_session(matches: getopts::Matches) -> (Session, Cfg) {
let sysroot = filesearch::materialize_sysroot(sessopts.maybe_sysroot.clone()); let sysroot = filesearch::materialize_sysroot(sessopts.maybe_sysroot.clone());
let target_cfg = rustc_session::config::build_target_config(&early_dcx, &sessopts, &sysroot); let target = rustc_session::config::build_target_config(&early_dcx, &sessopts, &sysroot);
let sess = build_session( let sess = build_session(
early_dcx, early_dcx,
@ -52,7 +52,7 @@ fn mk_session(matches: getopts::Matches) -> (Session, Cfg) {
vec![], vec![],
Default::default(), Default::default(),
None, None,
target_cfg, target,
sysroot, sysroot,
"", "",
None, None,

9
compiler/rustc_session/src/session.rs
View file

@ -1008,7 +1008,7 @@ pub fn build_session(
fluent_resources: Vec<&'static str>, fluent_resources: Vec<&'static str>,
driver_lint_caps: FxHashMap<lint::LintId, lint::Level>, driver_lint_caps: FxHashMap<lint::LintId, lint::Level>,
file_loader: Option<Box<dyn FileLoader + Send + Sync + 'static>>, file_loader: Option<Box<dyn FileLoader + Send + Sync + 'static>>,
target_cfg: Target, target: Target,
sysroot: PathBuf, sysroot: PathBuf,
cfg_version: &'static str, cfg_version: &'static str,
ice_file: Option<PathBuf>, ice_file: Option<PathBuf>,
@ -1036,7 +1036,7 @@ pub fn build_session(
let loader = file_loader.unwrap_or_else(|| Box::new(RealFileLoader)); let loader = file_loader.unwrap_or_else(|| Box::new(RealFileLoader));
let hash_kind = sopts.unstable_opts.src_hash_algorithm.unwrap_or_else(|| { let hash_kind = sopts.unstable_opts.src_hash_algorithm.unwrap_or_else(|| {
if target_cfg.is_like_msvc { if target.is_like_msvc {
SourceFileHashAlgorithm::Sha256 SourceFileHashAlgorithm::Sha256
} else { } else {
SourceFileHashAlgorithm::Md5 SourceFileHashAlgorithm::Md5
@ -1117,11 +1117,10 @@ pub fn build_session(
_ => CtfeBacktrace::Disabled, _ => CtfeBacktrace::Disabled,
}); });
let asm_arch = let asm_arch = if target.allow_asm { InlineAsmArch::from_str(&target.arch).ok() } else { None };
if target_cfg.allow_asm { InlineAsmArch::from_str(&target_cfg.arch).ok() } else { None };
let sess = Session { let sess = Session {
target: target_cfg, target,
host, host,
opts: sopts, opts: sopts,
host_tlib_path, host_tlib_path,