diff options
| author | Donough Liu <liudingming@bytdance.com> | 2022-08-29 19:06:36 +0100 |
|---|---|---|
| committer | bogon-right <bogon-right@bytedance.com> | 2022-08-30 04:42:03 +0100 |
| commit | 97b1a6146c630374ddab15f424eb8141dbb88960 (patch) | |
| tree | 44b36c68cb488cf66023a8c5eda9fa788d117b38 /compiler/rustc_errors/src | |
| parent | b96fa1a25ced4cfa72923e6d45f47f36c2c00ce0 (diff) | |
| download | rust-97b1a6146c630374ddab15f424eb8141dbb88960.tar.gz rust-97b1a6146c630374ddab15f424eb8141dbb88960.zip | |
Use more `into_iter` rather than `drain(..)`
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/diagnostic.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_errors/src/translation.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_errors/src/diagnostic.rs b/compiler/rustc_errors/src/diagnostic.rs index 506198df4d8..935a9639231 100644 --- a/compiler/rustc_errors/src/diagnostic.rs +++ b/compiler/rustc_errors/src/diagnostic.rs @@ -981,12 +981,12 @@ impl Diagnostic { fn sub_with_highlights<M: Into<SubdiagnosticMessage>>( &mut self, level: Level, - mut message: Vec<(M, Style)>, + message: Vec<(M, Style)>, span: MultiSpan, render_span: Option<MultiSpan>, ) { let message = message - .drain(..) + .into_iter() .map(|m| (self.subdiagnostic_message_to_diagnostic_message(m.0), m.1)) .collect(); let sub = SubDiagnostic { level, message, span, render_span }; diff --git a/compiler/rustc_errors/src/translation.rs b/compiler/rustc_errors/src/translation.rs index 65338f56d9c..4f407badb3f 100644 --- a/compiler/rustc_errors/src/translation.rs +++ b/compiler/rustc_errors/src/translation.rs @@ -21,7 +21,7 @@ pub trait Translate { /// Typically performed once for each diagnostic at the start of `emit_diagnostic` and then /// passed around as a reference thereafter. fn to_fluent_args<'arg>(&self, args: &[DiagnosticArg<'arg>]) -> FluentArgs<'arg> { - FromIterator::from_iter(args.to_vec().drain(..)) + FromIterator::from_iter(args.iter().cloned()) } /// Convert `DiagnosticMessage`s to a string, performing translation if necessary. |
