Skip to content

Commit 0a223a7

Browse files
committed
Auto merge of rust-lang#94385 - matthiaskrgr:rollup-4pwegqk, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - rust-lang#93603 (Populate liveness facts when calling `get_body_with_borrowck_facts` without `-Z polonius`) - rust-lang#93870 (Fix switch on discriminant detection in a presence of coverage counters) - rust-lang#94355 (Add one more case to avoid ICE) - rust-lang#94363 (Remove needless borrows from core::fmt) - rust-lang#94377 (`check_used` should only look at actual `used` attributes) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents abe7099 + 1dbce4a commit 0a223a7

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

core/src/fmt/builders.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ impl<'a, 'b: 'a> DebugStruct<'a, 'b> {
138138
}
139139
let mut slot = None;
140140
let mut state = Default::default();
141-
let mut writer = PadAdapter::wrap(&mut self.fmt, &mut slot, &mut state);
141+
let mut writer = PadAdapter::wrap(self.fmt, &mut slot, &mut state);
142142
writer.write_str(name)?;
143143
writer.write_str(": ")?;
144144
value.fmt(&mut writer)?;
@@ -189,7 +189,7 @@ impl<'a, 'b: 'a> DebugStruct<'a, 'b> {
189189
if self.is_pretty() {
190190
let mut slot = None;
191191
let mut state = Default::default();
192-
let mut writer = PadAdapter::wrap(&mut self.fmt, &mut slot, &mut state);
192+
let mut writer = PadAdapter::wrap(self.fmt, &mut slot, &mut state);
193193
writer.write_str("..\n")?;
194194
self.fmt.write_str("}")
195195
} else {
@@ -323,7 +323,7 @@ impl<'a, 'b: 'a> DebugTuple<'a, 'b> {
323323
}
324324
let mut slot = None;
325325
let mut state = Default::default();
326-
let mut writer = PadAdapter::wrap(&mut self.fmt, &mut slot, &mut state);
326+
let mut writer = PadAdapter::wrap(self.fmt, &mut slot, &mut state);
327327
value.fmt(&mut writer)?;
328328
writer.write_str(",\n")
329329
} else {
@@ -394,7 +394,7 @@ impl<'a, 'b: 'a> DebugInner<'a, 'b> {
394394
}
395395
let mut slot = None;
396396
let mut state = Default::default();
397-
let mut writer = PadAdapter::wrap(&mut self.fmt, &mut slot, &mut state);
397+
let mut writer = PadAdapter::wrap(self.fmt, &mut slot, &mut state);
398398
entry.fmt(&mut writer)?;
399399
writer.write_str(",\n")
400400
} else {
@@ -789,7 +789,7 @@ impl<'a, 'b: 'a> DebugMap<'a, 'b> {
789789
}
790790
let mut slot = None;
791791
self.state = Default::default();
792-
let mut writer = PadAdapter::wrap(&mut self.fmt, &mut slot, &mut self.state);
792+
let mut writer = PadAdapter::wrap(self.fmt, &mut slot, &mut self.state);
793793
key.fmt(&mut writer)?;
794794
writer.write_str(": ")?;
795795
} else {
@@ -845,7 +845,7 @@ impl<'a, 'b: 'a> DebugMap<'a, 'b> {
845845

846846
if self.is_pretty() {
847847
let mut slot = None;
848-
let mut writer = PadAdapter::wrap(&mut self.fmt, &mut slot, &mut self.state);
848+
let mut writer = PadAdapter::wrap(self.fmt, &mut slot, &mut self.state);
849849
value.fmt(&mut writer)?;
850850
writer.write_str(",\n")?;
851851
} else {

0 commit comments

Comments
 (0)