nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 16:54:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #96016 - Aaron1011:hash-name-cleanup, r=cjgillot

Browse Source 
Remove last vestiges of skippng ident span hashing

This removes a comment that no longer applies, and properly hashes
the full ident for path segments.
This commit is contained in:
bors 2022-04-17 10:31:52 +00:00
commit af68f7182e
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_ast/src/ast.rs
View File

@ -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);
}
}
}

10
compiler/rustc_span/src/hygiene.rs
View File

@ -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