From cee45632e89b550e83dbd55610657b139406a00f Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Sun, 19 Jan 2025 14:18:46 -0800
Subject: [PATCH] Rename FileName::QuoteExpansion to CfgSpec
I believe this variant name was used incorrectly. The timeline is roughly:
* `FileName::cfg_spec_source_code` was added in
https://github.com/rust-lang/rust/pull/54517. However, it used
`FileName::Quote` instead of `FileName::CfgSpec` which I believe was a
mistake.
* Quote stuff was removed in
https://github.com/rust-lang/rust/pull/51285, but did not remove
`FileName::Quote`.
* `FileName::CfgSpec` was removed in
https://github.com/rust-lang/rust/pull/116474 because it was unused.
This restores it so that the `--cfg` variant uses a name that makes more
sense with how it is used, and restores what I think is the original
intent.
---
compiler/rustc_session/src/config.rs | 2 +-
compiler/rustc_span/src/lib.rs | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs
index 21afb7df7cb3a..eafb6f370f6a8 100644
--- a/compiler/rustc_session/src/config.rs
+++ b/compiler/rustc_session/src/config.rs
@@ -888,7 +888,7 @@ impl Input {
Input::File(file) => Some(file),
Input::Str { name, .. } => match name {
FileName::Real(real) => real.local_path(),
- FileName::QuoteExpansion(_) => None,
+ FileName::CfgSpec(_) => None,
FileName::Anon(_) => None,
FileName::MacroExpansion(_) => None,
FileName::ProcMacroSourceCode(_) => None,
diff --git a/compiler/rustc_span/src/lib.rs b/compiler/rustc_span/src/lib.rs
index 51cfbf594716c..f932d3c8073db 100644
--- a/compiler/rustc_span/src/lib.rs
+++ b/compiler/rustc_span/src/lib.rs
@@ -305,8 +305,8 @@ impl RealFileName {
#[derive(Debug, Eq, PartialEq, Clone, Ord, PartialOrd, Hash, Decodable, Encodable)]
pub enum FileName {
Real(RealFileName),
- /// Call to `quote!`.
- QuoteExpansion(Hash64),
+ /// Strings provided as `--cfg [cfgspec]`.
+ CfgSpec(Hash64),
/// Command line.
Anon(Hash64),
/// Hack in `src/librustc_ast/parse.rs`.
@@ -353,7 +353,7 @@ impl fmt::Display for FileNameDisplay<'_> {
Real(ref name) => {
write!(fmt, "{}", name.to_string_lossy(self.display_pref))
}
- QuoteExpansion(_) => write!(fmt, "<quote expansion>"),
+ CfgSpec(_) => write!(fmt, "<cfgspec>"),
MacroExpansion(_) => write!(fmt, "<macro expansion>"),
Anon(_) => write!(fmt, "<anon>"),
ProcMacroSourceCode(_) => write!(fmt, "<proc-macro source code>"),
@@ -384,7 +384,7 @@ impl FileName {
| ProcMacroSourceCode(_)
| CliCrateAttr(_)
| Custom(_)
- | QuoteExpansion(_)
+ | CfgSpec(_)
| DocTest(_, _)
| InlineAsm(_) => false,
}
@@ -425,7 +425,7 @@ impl FileName {
pub fn cfg_spec_source_code(src: &str) -> FileName {
let mut hasher = StableHasher::new();
src.hash(&mut hasher);
- FileName::QuoteExpansion(hasher.finish())
+ FileName::CfgSpec(hasher.finish())
}
pub fn cli_crate_attr_source_code(src: &str) -> FileName {