diff options
| -rw-r--r-- | compiler/rustc_ast/src/ast.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_span/src/hygiene.rs | 10 |
2 files changed, 2 insertions, 12 deletions
diff --git a/compiler/rustc_ast/src/ast.rs b/compiler/rustc_ast/src/ast.rs index 714f9383bb2..b7da276fc7e 100644 --- a/compiler/rustc_ast/src/ast.rs +++ b/compiler/rustc_ast/src/ast.rs @@ -107,11 +107,11 @@ impl PartialEq<Symbol> for Path { } } -impl<CTX> HashStable<CTX> for Path { +impl<CTX: rustc_span::HashStableContext> HashStable<CTX> for Path { fn hash_stable(&self, hcx: &mut CTX, hasher: &mut StableHasher) { self.segments.len().hash_stable(hcx, hasher); for segment in &self.segments { - segment.ident.name.hash_stable(hcx, hasher); + segment.ident.hash_stable(hcx, hasher); } } } diff --git a/compiler/rustc_span/src/hygiene.rs b/compiler/rustc_span/src/hygiene.rs index 7ebf323e20d..3889639b50f 100644 --- a/compiler/rustc_span/src/hygiene.rs +++ b/compiler/rustc_span/src/hygiene.rs @@ -103,16 +103,6 @@ impl !PartialOrd for LocalExpnId {} /// of `HashingControls` settings. fn assert_default_hashing_controls<CTX: HashStableContext>(ctx: &CTX, msg: &str) { match ctx.hashing_controls() { - // Ideally, we would also check that `node_id_hashing_mode` was always - // `NodeIdHashingMode::HashDefPath`. However, we currently end up hashing - // `Span`s in this mode, and there's not an easy way to change that. - // All of the span-related data that we hash is pretty self-contained - // (in particular, we don't hash any `HirId`s), so this shouldn't result - // in any caching problems. - // FIXME: Enforce that we don't end up transitively hashing any `HirId`s, - // or ensure that this method is always invoked with the same - // `NodeIdHashingMode` - // // Note that we require that `hash_spans` be set according to the global // `-Z incremental-ignore-spans` option. Normally, this option is disabled, // which will cause us to require that this method always be called with `Span` hashing |