Skip to content

Commit f764d7c

Browse files
Rollup merge of rust-lang#157336 - JarlEvanson:mem-replace-with-default, r=JonathanBrouwer
Enable `clippy::mem_replace_with_default` Enables `clippy::mem_replace_with_default` and fixes the errors that occur as a result. Closes rust-lang#157245.
2 parents 0b27d7b + 3dacac8 commit f764d7c

4 files changed

Lines changed: 4 additions & 3 deletions

File tree

compiler/rustc_codegen_ssa/src/back/write.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1964,7 +1964,7 @@ impl Emitter for SharedEmitter {
19641964
assert_eq!(diag.is_lint, None);
19651965
// No sensible check for `diag.emitted_at`.
19661966

1967-
let args = mem::replace(&mut diag.args, DiagArgMap::default());
1967+
let args = mem::take(&mut diag.args);
19681968
drop(
19691969
self.sender.send(SharedEmitterMessage::Diagnostic(Diagnostic {
19701970
span: diag.span.primary_spans().iter().map(|span| span.data()).collect::<Vec<_>>(),

compiler/rustc_middle/src/dep_graph/serialized.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ impl EncoderState {
738738
// Prevent more indices from being allocated on this thread.
739739
local.remaining_node_index = 0;
740740

741-
let data = mem::replace(&mut local.encoder.data, Vec::new());
741+
let data = mem::take(&mut local.encoder.data);
742742
self.file.lock().as_mut().unwrap().emit_raw_bytes(&data);
743743

744744
LocalEncoderResult {

compiler/rustc_span/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2573,7 +2573,7 @@ fn normalize_newlines(src: &mut String, normalized_pos: &mut Vec<NormalizedPos>)
25732573
// directly, let's rather steal the contents of `src`. This makes the code
25742574
// safe even if a panic occurs.
25752575

2576-
let mut buf = std::mem::replace(src, String::new()).into_bytes();
2576+
let mut buf = std::mem::take(src).into_bytes();
25772577
let mut gap_len = 0;
25782578
let mut tail = buf.as_mut_slice();
25792579
let mut cursor = 0;

src/bootstrap/src/core/build_steps/clippy.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,7 @@ impl Step for CI {
607607
"clippy::single_char_add_str".into(),
608608
"clippy::to_string_in_format_args".into(),
609609
"clippy::unconditional_recursion".into(),
610+
"clippy::mem_replace_with_default".into(),
610611
],
611612
forbid: vec![],
612613
};

0 commit comments

Comments
 (0)