squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects 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
parent 9a576175cc 42b9d3fb72
commit b3bcf4af74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats 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(());
}
match self.active_cache.entry(cache_key.clone()) {
match self.active_cache.entry(cache_key) {
Entry::Occupied(o) => {
let node = &mut self.nodes[*o.get()];
if let Some(parent_index) = parent {
@ -366,8 +366,7 @@ impl<O: ForestObligation> ObligationForest<O> {
&& self
.error_cache
.get(&obligation_tree_id)
.map(|errors| errors.contains(&cache_key))
.unwrap_or(false);
.map_or(false, |errors| errors.contains(v.key()));
if already_failed {
Err(())