bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rollup merge of #85436 - tamird:save-clone, r=estebank

Browse source 
Avoid cloning cache key

r? `@estebank`
This commit is contained in:
Yuki Okushi 2021-06-06 19:11:16 +09:00 • committed by GitHub
commit b3bcf4af74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_data_structures/src/obligation_forest/mod.rs
View file

@ -342,7 +342,7 @@ impl<O: ForestObligation> ObligationForest<O> {
return Ok(()); return Ok(());
} }
match self.active_cache.entry(cache_key.clone()) { match self.active_cache.entry(cache_key) {
Entry::Occupied(o) => { Entry::Occupied(o) => {
let node = &mut self.nodes[*o.get()]; let node = &mut self.nodes[*o.get()];
if let Some(parent_index) = parent { if let Some(parent_index) = parent {
@ -366,8 +366,7 @@ impl<O: ForestObligation> ObligationForest<O> {
&& self && self
.error_cache .error_cache
.get(&obligation_tree_id) .get(&obligation_tree_id)
.map(|errors| errors.contains(&cache_key)) .map_or(false, |errors| errors.contains(v.key()));
.unwrap_or(false);
if already_failed { if already_failed {
Err(()) Err(())