OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nak: fix clippy::mem_replace_with_default warnings

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27234>
This commit is contained in:
Karol Herbst
2024-01-24 12:33:55 +01:00
committed by Marge Bot
parent cab414669f
commit ec7b32d920
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nouveau/compiler/nak/to_cssa.rs
View File

@@ -236,8 +236,8 @@ impl<'a> CoalesceGraph<'a> {
} }
pub fn sets_merge(&mut self, a: usize, b: usize) -> usize { 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 a_nodes = std::mem::take(&mut self.sets[a].nodes);
let b_nodes = std::mem::replace(&mut self.sets[b].nodes, Vec::new()); let b_nodes = std::mem::take(&mut self.sets[b].nodes);
let nodes = MergedIter::new(a_nodes.into_iter(), b_nodes.into_iter()); let nodes = MergedIter::new(a_nodes.into_iter(), b_nodes.into_iter());
self.sets[a].nodes = nodes self.sets[a].nodes = nodes
@@ -315,8 +315,7 @@ impl Function {
cg.init_sets(&self.blocks); cg.init_sets(&self.blocks);
for bi in 0..self.blocks.len() { for bi in 0..self.blocks.len() {
let block_instrs = let block_instrs = std::mem::take(&mut self.blocks[bi].instrs);
std::mem::replace(&mut self.blocks[bi].instrs, Vec::new());
let mut instrs = Vec::new(); let mut instrs = Vec::new();
for mut instr in block_instrs.into_iter() { for mut instr in block_instrs.into_iter() {