diff --git a/src/nouveau/compiler/nak/to_cssa.rs b/src/nouveau/compiler/nak/to_cssa.rs index 6846ecc1f22..94eab3237e7 100644 --- a/src/nouveau/compiler/nak/to_cssa.rs +++ b/src/nouveau/compiler/nak/to_cssa.rs @@ -236,8 +236,8 @@ impl<'a> CoalesceGraph<'a> { } pub fn sets_merge(&mut self, a: usize, b: usize) -> usize { - let a_nodes = std::mem::replace(&mut self.sets[a].nodes, Vec::new()); - let b_nodes = std::mem::replace(&mut self.sets[b].nodes, Vec::new()); + let a_nodes = std::mem::take(&mut self.sets[a].nodes); + let b_nodes = std::mem::take(&mut self.sets[b].nodes); let nodes = MergedIter::new(a_nodes.into_iter(), b_nodes.into_iter()); self.sets[a].nodes = nodes @@ -315,8 +315,7 @@ impl Function { cg.init_sets(&self.blocks); for bi in 0..self.blocks.len() { - let block_instrs = - std::mem::replace(&mut self.blocks[bi].instrs, Vec::new()); + let block_instrs = std::mem::take(&mut self.blocks[bi].instrs); let mut instrs = Vec::new(); for mut instr in block_instrs.into_iter() {