Skip to content

Commit 09d56a7

Browse files
Rollup merge of #88050 - Aaron1011:filename-hash-stable, r=michaelwoerister
Remove `HashStable` impls for `FileName` and `RealFileName` These impls were unused, and incorrectly hashed the local (non-remapped) path for `RealFileName::Remapped` (which would break reproducible builds if these impls were used).
2 parents 8b9a4c3 + d8c3a64 commit 09d56a7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

compiler/rustc_span/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ scoped_tls::scoped_thread_local!(static SESSION_GLOBALS: SessionGlobals);
157157
// FIXME: We should use this enum or something like it to get rid of the
158158
// use of magic `/rust/1.x/...` paths across the board.
159159
#[derive(Debug, Eq, PartialEq, Clone, Ord, PartialOrd)]
160-
#[derive(HashStable_Generic, Decodable)]
160+
#[derive(Decodable)]
161161
pub enum RealFileName {
162162
LocalPath(PathBuf),
163163
/// For remapped paths (namely paths into libstd that have been mapped
@@ -269,7 +269,7 @@ impl RealFileName {
269269

270270
/// Differentiates between real files and common virtual files.
271271
#[derive(Debug, Eq, PartialEq, Clone, Ord, PartialOrd, Hash)]
272-
#[derive(HashStable_Generic, Decodable, Encodable)]
272+
#[derive(Decodable, Encodable)]
273273
pub enum FileName {
274274
Real(RealFileName),
275275
/// Call to `quote!`.

0 commit comments

Comments
 (0)