diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2021-08-19 19:30:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-19 19:30:07 +0200 |
| commit | 09d56a749c56b03f3b56b5d673328a58838cb5ca (patch) | |
| tree | fbf7bad4359cdfe91fac41d786f21b16ad321bc2 | |
| parent | 8b9a4c3c4bf1ec9b16d8e9913d4038c89b48db44 (diff) | |
| parent | d8c3a649a6c94c56b4cbd3dd8d8301a58e0424eb (diff) | |
| download | rust-09d56a749c56b03f3b56b5d673328a58838cb5ca.tar.gz rust-09d56a749c56b03f3b56b5d673328a58838cb5ca.zip | |
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).
| -rw-r--r-- | compiler/rustc_span/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_span/src/lib.rs b/compiler/rustc_span/src/lib.rs index 1c95cc91208..9e127577b61 100644 --- a/compiler/rustc_span/src/lib.rs +++ b/compiler/rustc_span/src/lib.rs @@ -157,7 +157,7 @@ scoped_tls::scoped_thread_local!(static SESSION_GLOBALS: SessionGlobals); // FIXME: We should use this enum or something like it to get rid of the // use of magic `/rust/1.x/...` paths across the board. #[derive(Debug, Eq, PartialEq, Clone, Ord, PartialOrd)] -#[derive(HashStable_Generic, Decodable)] +#[derive(Decodable)] pub enum RealFileName { LocalPath(PathBuf), /// For remapped paths (namely paths into libstd that have been mapped @@ -269,7 +269,7 @@ impl RealFileName { /// Differentiates between real files and common virtual files. #[derive(Debug, Eq, PartialEq, Clone, Ord, PartialOrd, Hash)] -#[derive(HashStable_Generic, Decodable, Encodable)] +#[derive(Decodable, Encodable)] pub enum FileName { Real(RealFileName), /// Call to `quote!`. |