bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename PrintKind::{AllTargetSpecs,TargetSpec} to {AllTargetSpecsJson,TargetSpecJson}

Browse source 
To correspond to their actual print request names, `target-spec-json`
and `all-target-specs-json`, and for consistency with other print name
<-> print kind mappings.
This commit is contained in:
Jieyou Xu 2025-03-16 12:58:53 +08:00
parent f9eabc28d9
commit 24edbfbc24
No known key found for this signature in database
GPG key ID: 045B995028EA6AFC
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_driver_impl/src/lib.rs
View file

@ -649,10 +649,10 @@ fn print_crate_info(
HostTuple => println_info!("{}", rustc_session::config::host_tuple()), HostTuple => println_info!("{}", rustc_session::config::host_tuple()),
Sysroot => println_info!("{}", sess.sysroot.display()), Sysroot => println_info!("{}", sess.sysroot.display()),
TargetLibdir => println_info!("{}", sess.target_tlib_path.dir.display()), TargetLibdir => println_info!("{}", sess.target_tlib_path.dir.display()),
TargetSpec => { TargetSpecJson => {
println_info!("{}", serde_json::to_string_pretty(&sess.target.to_json()).unwrap()); println_info!("{}", serde_json::to_string_pretty(&sess.target.to_json()).unwrap());
} }
AllTargetSpecs => { AllTargetSpecsJson => {
let mut targets = BTreeMap::new(); let mut targets = BTreeMap::new();
for name in rustc_target::spec::TARGETS { for name in rustc_target::spec::TARGETS {
let triple = TargetTuple::from_tuple(name); let triple = TargetTuple::from_tuple(name);

10
compiler/rustc_session/src/config.rs
View file

@ -44,7 +44,7 @@ pub mod sigpipe;
pub const PRINT_KINDS: &[(&str, PrintKind)] = &[ pub const PRINT_KINDS: &[(&str, PrintKind)] = &[
// tidy-alphabetical-start // tidy-alphabetical-start
("all-target-specs-json", PrintKind::AllTargetSpecs), ("all-target-specs-json", PrintKind::AllTargetSpecsJson),
("calling-conventions", PrintKind::CallingConventions), ("calling-conventions", PrintKind::CallingConventions),
("cfg", PrintKind::Cfg), ("cfg", PrintKind::Cfg),
("check-cfg", PrintKind::CheckCfg), ("check-cfg", PrintKind::CheckCfg),
@ -63,7 +63,7 @@ pub const PRINT_KINDS: &[(&str, PrintKind)] = &[
("target-features", PrintKind::TargetFeatures), ("target-features", PrintKind::TargetFeatures),
("target-libdir", PrintKind::TargetLibdir), ("target-libdir", PrintKind::TargetLibdir),
("target-list", PrintKind::TargetList), ("target-list", PrintKind::TargetList),
("target-spec-json", PrintKind::TargetSpec), ("target-spec-json", PrintKind::TargetSpecJson),
("tls-models", PrintKind::TlsModels), ("tls-models", PrintKind::TlsModels),
// tidy-alphabetical-end // tidy-alphabetical-end
]; ];
@ -874,7 +874,7 @@ pub struct PrintRequest {
#[derive(Copy, Clone, PartialEq, Eq, Debug)] #[derive(Copy, Clone, PartialEq, Eq, Debug)]
pub enum PrintKind { pub enum PrintKind {
// tidy-alphabetical-start // tidy-alphabetical-start
AllTargetSpecs, AllTargetSpecsJson,
CallingConventions, CallingConventions,
Cfg, Cfg,
CheckCfg, CheckCfg,
@ -893,7 +893,7 @@ pub enum PrintKind {
TargetFeatures, TargetFeatures,
TargetLibdir, TargetLibdir,
TargetList, TargetList,
TargetSpec, TargetSpecJson,
TlsModels, TlsModels,
// tidy-alphabetical-end // tidy-alphabetical-end
} }
@ -2063,7 +2063,7 @@ fn check_print_request_stability(
(print_name, print_kind): (&str, PrintKind), (print_name, print_kind): (&str, PrintKind),
) { ) {
match print_kind { match print_kind {
PrintKind::AllTargetSpecs | PrintKind::CheckCfg | PrintKind::TargetSpec PrintKind::AllTargetSpecsJson | PrintKind::CheckCfg | PrintKind::TargetSpecJson
if !unstable_opts.unstable_options => if !unstable_opts.unstable_options =>
{ {
early_dcx.early_fatal(format!( early_dcx.early_fatal(format!(