Skip to content

Commit 1c6a061

Browse files
borsbors
committed
Auto merge of #119009 - workingjubilee:rollup-ytexy6j, r=workingjubilee
Rollup of 6 pull requests Successful merges: - #118523 (Add ASCII whitespace trimming functions to `&str`) - #118851 ([std] Add xcoff in object's feature list) - #118989 (Simplify lint decorator derive too) - #118993 (use `if cfg!` instead of `#[cfg]`) - #119003 (NFC: do not clone types that are copy) - #119004 (NFC don't convert types to identical types) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 5c927ab + c5a3d98 commit 1c6a061

File tree

37 files changed

+146
-128
lines changed

37 files changed

+146
-128
lines changed

Diff for: ‎compiler/rustc_ast_lowering/src/expr.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1260,9 +1260,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
12601260
);
12611261

12621262
// `a = lhs1; b = lhs2;`.
1263-
let stmts = self
1264-
.arena
1265-
.alloc_from_iter(std::iter::once(destructure_let).chain(assignments.into_iter()));
1263+
let stmts = self.arena.alloc_from_iter(std::iter::once(destructure_let).chain(assignments));
12661264

12671265
// Wrap everything in a block.
12681266
hir::ExprKind::Block(self.block_all(whole_span, stmts, None), None)

Diff for: ‎compiler/rustc_codegen_llvm/src/builder.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
353353
let new_kind = match ty.kind() {
354354
Int(t @ Isize) => Int(t.normalize(self.tcx.sess.target.pointer_width)),
355355
Uint(t @ Usize) => Uint(t.normalize(self.tcx.sess.target.pointer_width)),
356-
t @ (Uint(_) | Int(_)) => t.clone(),
356+
t @ (Uint(_) | Int(_)) => *t,
357357
_ => panic!("tried to get overflow intrinsic for op applied to non-int type"),
358358
};
359359

Diff for: ‎compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ pub fn file_metadata<'ll>(cx: &CodegenCx<'ll, '_>, source_file: &SourceFile) ->
607607

608608
if let Ok(rel_path) = abs_path.strip_prefix(working_directory) {
609609
(
610-
working_directory.to_string_lossy().into(),
610+
working_directory.to_string_lossy(),
611611
rel_path.to_string_lossy().into_owned(),
612612
)
613613
} else {

Diff for: ‎compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ pub fn build_coroutine_variant_struct_type_di_node<'ll, 'tcx>(
396396
})
397397
.collect();
398398

399-
state_specific_fields.into_iter().chain(common_fields.into_iter()).collect()
399+
state_specific_fields.into_iter().chain(common_fields).collect()
400400
},
401401
|cx| build_generic_type_param_di_nodes(cx, coroutine_type_and_layout.ty),
402402
)

Diff for: ‎compiler/rustc_data_structures/src/sorted_map.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ impl<K: Ord, V> SortedMap<K, V> {
198198
if index == self.data.len() || elements.last().unwrap().0 < self.data[index].0 {
199199
// We can copy the whole range without having to mix with
200200
// existing elements.
201-
self.data.splice(index..index, elements.into_iter());
201+
self.data.splice(index..index, elements);
202202
return;
203203
}
204204

Diff for: ‎compiler/rustc_errors/src/diagnostic.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,7 @@ where
9191
#[rustc_diagnostic_item = "DecorateLint"]
9292
pub trait DecorateLint<'a, G: EmissionGuarantee> {
9393
/// Decorate and emit a lint.
94-
fn decorate_lint<'b>(
95-
self,
96-
diag: &'b mut DiagnosticBuilder<'a, G>,
97-
) -> &'b mut DiagnosticBuilder<'a, G>;
94+
fn decorate_lint<'b>(self, diag: &'b mut DiagnosticBuilder<'a, G>);
9895

9996
fn msg(&self) -> DiagnosticMessage;
10097
}

Diff for: ‎compiler/rustc_errors/src/emitter.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -2677,10 +2677,7 @@ fn from_stderr(color: ColorConfig) -> Destination {
26772677
/// On Windows, BRIGHT_BLUE is hard to read on black. Use cyan instead.
26782678
///
26792679
/// See #36178.
2680-
#[cfg(windows)]
2681-
const BRIGHT_BLUE: Color = Color::Cyan;
2682-
#[cfg(not(windows))]
2683-
const BRIGHT_BLUE: Color = Color::Blue;
2680+
const BRIGHT_BLUE: Color = if cfg!(windows) { Color::Cyan } else { Color::Blue };
26842681

26852682
impl Style {
26862683
fn color_spec(&self, lvl: Level) -> ColorSpec {

Diff for: ‎compiler/rustc_hir/src/hir.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -1557,7 +1557,7 @@ impl Expr<'_> {
15571557
ExprKind::Call(..) => ExprPrecedence::Call,
15581558
ExprKind::MethodCall(..) => ExprPrecedence::MethodCall,
15591559
ExprKind::Tup(_) => ExprPrecedence::Tup,
1560-
ExprKind::Binary(op, ..) => ExprPrecedence::Binary(op.node.into()),
1560+
ExprKind::Binary(op, ..) => ExprPrecedence::Binary(op.node),
15611561
ExprKind::Unary(..) => ExprPrecedence::Unary,
15621562
ExprKind::Lit(_) => ExprPrecedence::Lit,
15631563
ExprKind::Type(..) | ExprKind::Cast(..) => ExprPrecedence::Cast,
@@ -1697,11 +1697,9 @@ impl Expr<'_> {
16971697
// them being used only for its side-effects.
16981698
base.can_have_side_effects()
16991699
}
1700-
ExprKind::Struct(_, fields, init) => fields
1701-
.iter()
1702-
.map(|field| field.expr)
1703-
.chain(init.into_iter())
1704-
.any(|e| e.can_have_side_effects()),
1700+
ExprKind::Struct(_, fields, init) => {
1701+
fields.iter().map(|field| field.expr).chain(init).any(|e| e.can_have_side_effects())
1702+
}
17051703

17061704
ExprKind::Array(args)
17071705
| ExprKind::Tup(args)

Diff for: ‎compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ impl<'a, 'tcx> BoundVarContext<'a, 'tcx> {
350350
// Nested poly trait refs have the binders concatenated
351351
let mut full_binders =
352352
self.map.late_bound_vars.entry(*hir_id).or_default().clone();
353-
full_binders.extend(supertrait_bound_vars.into_iter());
353+
full_binders.extend(supertrait_bound_vars);
354354
break (full_binders, BinderScopeType::Concatenating);
355355
}
356356
}

Diff for: ‎compiler/rustc_hir_typeck/src/errors.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -573,13 +573,13 @@ impl rustc_errors::AddToDiagnostic for CastUnknownPointerSub {
573573
{
574574
match self {
575575
CastUnknownPointerSub::To(span) => {
576-
let msg = f(diag, crate::fluent_generated::hir_typeck_label_to.into());
576+
let msg = f(diag, crate::fluent_generated::hir_typeck_label_to);
577577
diag.span_label(span, msg);
578-
let msg = f(diag, crate::fluent_generated::hir_typeck_note.into());
578+
let msg = f(diag, crate::fluent_generated::hir_typeck_note);
579579
diag.note(msg);
580580
}
581581
CastUnknownPointerSub::From(span) => {
582-
let msg = f(diag, crate::fluent_generated::hir_typeck_label_from.into());
582+
let msg = f(diag, crate::fluent_generated::hir_typeck_label_from);
583583
diag.span_label(span, msg);
584584
}
585585
}

Diff for: ‎compiler/rustc_hir_typeck/src/method/probe.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1546,9 +1546,9 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
15461546
);
15471547

15481548
let candidate_obligations = impl_obligations
1549-
.chain(norm_obligations.into_iter())
1549+
.chain(norm_obligations)
15501550
.chain(ref_obligations.iter().cloned())
1551-
.chain(normalization_obligations.into_iter());
1551+
.chain(normalization_obligations);
15521552

15531553
// Evaluate those obligations to see if they might possibly hold.
15541554
for o in candidate_obligations {

Diff for: ‎compiler/rustc_infer/src/infer/outlives/verify.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,7 @@ impl<'cx, 'tcx> VerifyBoundCx<'cx, 'tcx> {
130130
// see the extensive comment in projection_must_outlive
131131
let recursive_bound = {
132132
let mut components = smallvec![];
133-
compute_alias_components_recursive(
134-
self.tcx,
135-
alias_ty_as_ty.into(),
136-
&mut components,
137-
visited,
138-
);
133+
compute_alias_components_recursive(self.tcx, alias_ty_as_ty, &mut components, visited);
139134
self.bound_from_components(&components, visited)
140135
};
141136

Diff for: ‎compiler/rustc_infer/src/infer/relate/combine.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ impl<'infcx, 'tcx> CombineFields<'infcx, 'tcx> {
552552
}
553553

554554
pub fn register_obligations(&mut self, obligations: PredicateObligations<'tcx>) {
555-
self.obligations.extend(obligations.into_iter());
555+
self.obligations.extend(obligations);
556556
}
557557

558558
pub fn register_predicates(&mut self, obligations: impl IntoIterator<Item: ToPredicate<'tcx>>) {

Diff for: ‎compiler/rustc_lint/src/lints.rs

+11-45
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,8 @@ pub struct BuiltinMissingDebugImpl<'a> {
134134

135135
// Needed for def_path_str
136136
impl<'a> DecorateLint<'a, ()> for BuiltinMissingDebugImpl<'_> {
137-
fn decorate_lint<'b>(
138-
self,
139-
diag: &'b mut rustc_errors::DiagnosticBuilder<'a, ()>,
140-
) -> &'b mut rustc_errors::DiagnosticBuilder<'a, ()> {
137+
fn decorate_lint<'b>(self, diag: &'b mut rustc_errors::DiagnosticBuilder<'a, ()>) {
141138
diag.set_arg("debug", self.tcx.def_path_str(self.def_id));
142-
diag
143139
}
144140

145141
fn msg(&self) -> DiagnosticMessage {
@@ -243,17 +239,13 @@ pub struct BuiltinUngatedAsyncFnTrackCaller<'a> {
243239
}
244240

245241
impl<'a> DecorateLint<'a, ()> for BuiltinUngatedAsyncFnTrackCaller<'_> {
246-
fn decorate_lint<'b>(
247-
self,
248-
diag: &'b mut rustc_errors::DiagnosticBuilder<'a, ()>,
249-
) -> &'b mut rustc_errors::DiagnosticBuilder<'a, ()> {
242+
fn decorate_lint<'b>(self, diag: &'b mut rustc_errors::DiagnosticBuilder<'a, ()>) {
250243
diag.span_label(self.label, fluent::lint_label);
251244
rustc_session::parse::add_feature_diagnostics(
252245
diag,
253246
self.parse_sess,
254247
sym::async_fn_track_caller,
255248
);
256-
diag
257249
}
258250

259251
fn msg(&self) -> DiagnosticMessage {
@@ -433,10 +425,7 @@ pub struct BuiltinUnpermittedTypeInit<'a> {
433425
}
434426

435427
impl<'a> DecorateLint<'a, ()> for BuiltinUnpermittedTypeInit<'_> {
436-
fn decorate_lint<'b>(
437-
self,
438-
diag: &'b mut rustc_errors::DiagnosticBuilder<'a, ()>,
439-
) -> &'b mut rustc_errors::DiagnosticBuilder<'a, ()> {
428+
fn decorate_lint<'b>(self, diag: &'b mut rustc_errors::DiagnosticBuilder<'a, ()>) {
440429
diag.set_arg("ty", self.ty);
441430
diag.span_label(self.label, fluent::lint_builtin_unpermitted_type_init_label);
442431
if let InhabitedPredicate::True = self.ty.inhabited_predicate(self.tcx) {
@@ -447,7 +436,6 @@ impl<'a> DecorateLint<'a, ()> for BuiltinUnpermittedTypeInit<'_> {
447436
);
448437
}
449438
self.sub.add_to_diagnostic(diag);
450-
diag
451439
}
452440

453441
fn msg(&self) -> rustc_errors::DiagnosticMessage {
@@ -1159,10 +1147,7 @@ pub struct NonFmtPanicUnused {
11591147

11601148
// Used because of two suggestions based on one Option<Span>
11611149
impl<'a> DecorateLint<'a, ()> for NonFmtPanicUnused {
1162-
fn decorate_lint<'b>(
1163-
self,
1164-
diag: &'b mut rustc_errors::DiagnosticBuilder<'a, ()>,
1165-
) -> &'b mut rustc_errors::DiagnosticBuilder<'a, ()> {
1150+
fn decorate_lint<'b>(self, diag: &'b mut rustc_errors::DiagnosticBuilder<'a, ()>) {
11661151
diag.set_arg("count", self.count);
11671152
diag.note(fluent::lint_note);
11681153
if let Some(span) = self.suggestion {
@@ -1179,7 +1164,6 @@ impl<'a> DecorateLint<'a, ()> for NonFmtPanicUnused {
11791164
Applicability::MachineApplicable,
11801165
);
11811166
}
1182-
diag
11831167
}
11841168

11851169
fn msg(&self) -> rustc_errors::DiagnosticMessage {
@@ -1358,12 +1342,9 @@ pub struct DropTraitConstraintsDiag<'a> {
13581342

13591343
// Needed for def_path_str
13601344
impl<'a> DecorateLint<'a, ()> for DropTraitConstraintsDiag<'_> {
1361-
fn decorate_lint<'b>(
1362-
self,
1363-
diag: &'b mut rustc_errors::DiagnosticBuilder<'a, ()>,
1364-
) -> &'b mut rustc_errors::DiagnosticBuilder<'a, ()> {
1345+
fn decorate_lint<'b>(self, diag: &'b mut rustc_errors::DiagnosticBuilder<'a, ()>) {
13651346
diag.set_arg("predicate", self.predicate);
1366-
diag.set_arg("needs_drop", self.tcx.def_path_str(self.def_id))
1347+
diag.set_arg("needs_drop", self.tcx.def_path_str(self.def_id));
13671348
}
13681349

13691350
fn msg(&self) -> rustc_errors::DiagnosticMessage {
@@ -1378,11 +1359,8 @@ pub struct DropGlue<'a> {
13781359

13791360
// Needed for def_path_str
13801361
impl<'a> DecorateLint<'a, ()> for DropGlue<'_> {
1381-
fn decorate_lint<'b>(
1382-
self,
1383-
diag: &'b mut rustc_errors::DiagnosticBuilder<'a, ()>,
1384-
) -> &'b mut rustc_errors::DiagnosticBuilder<'a, ()> {
1385-
diag.set_arg("needs_drop", self.tcx.def_path_str(self.def_id))
1362+
fn decorate_lint<'b>(self, diag: &'b mut rustc_errors::DiagnosticBuilder<'a, ()>) {
1363+
diag.set_arg("needs_drop", self.tcx.def_path_str(self.def_id));
13861364
}
13871365

13881366
fn msg(&self) -> rustc_errors::DiagnosticMessage {
@@ -1655,10 +1633,7 @@ pub struct ImproperCTypes<'a> {
16551633

16561634
// Used because of the complexity of Option<DiagnosticMessage>, DiagnosticMessage, and Option<Span>
16571635
impl<'a> DecorateLint<'a, ()> for ImproperCTypes<'_> {
1658-
fn decorate_lint<'b>(
1659-
self,
1660-
diag: &'b mut rustc_errors::DiagnosticBuilder<'a, ()>,
1661-
) -> &'b mut rustc_errors::DiagnosticBuilder<'a, ()> {
1636+
fn decorate_lint<'b>(self, diag: &'b mut rustc_errors::DiagnosticBuilder<'a, ()>) {
16621637
diag.set_arg("ty", self.ty);
16631638
diag.set_arg("desc", self.desc);
16641639
diag.span_label(self.label, fluent::lint_label);
@@ -1669,7 +1644,6 @@ impl<'a> DecorateLint<'a, ()> for ImproperCTypes<'_> {
16691644
if let Some(note) = self.span_note {
16701645
diag.span_note(note, fluent::lint_note);
16711646
}
1672-
diag
16731647
}
16741648

16751649
fn msg(&self) -> rustc_errors::DiagnosticMessage {
@@ -1802,10 +1776,7 @@ pub enum UnusedDefSuggestion {
18021776

18031777
// Needed because of def_path_str
18041778
impl<'a> DecorateLint<'a, ()> for UnusedDef<'_, '_> {
1805-
fn decorate_lint<'b>(
1806-
self,
1807-
diag: &'b mut rustc_errors::DiagnosticBuilder<'a, ()>,
1808-
) -> &'b mut rustc_errors::DiagnosticBuilder<'a, ()> {
1779+
fn decorate_lint<'b>(self, diag: &'b mut rustc_errors::DiagnosticBuilder<'a, ()>) {
18091780
diag.set_arg("pre", self.pre);
18101781
diag.set_arg("post", self.post);
18111782
diag.set_arg("def", self.cx.tcx.def_path_str(self.def_id));
@@ -1816,7 +1787,6 @@ impl<'a> DecorateLint<'a, ()> for UnusedDef<'_, '_> {
18161787
if let Some(sugg) = self.suggestion {
18171788
diag.subdiagnostic(sugg);
18181789
}
1819-
diag
18201790
}
18211791

18221792
fn msg(&self) -> rustc_errors::DiagnosticMessage {
@@ -1889,15 +1859,11 @@ pub struct AsyncFnInTraitDiag {
18891859
}
18901860

18911861
impl<'a> DecorateLint<'a, ()> for AsyncFnInTraitDiag {
1892-
fn decorate_lint<'b>(
1893-
self,
1894-
diag: &'b mut rustc_errors::DiagnosticBuilder<'a, ()>,
1895-
) -> &'b mut rustc_errors::DiagnosticBuilder<'a, ()> {
1862+
fn decorate_lint<'b>(self, diag: &'b mut rustc_errors::DiagnosticBuilder<'a, ()>) {
18961863
diag.note(fluent::lint_note);
18971864
if let Some(sugg) = self.sugg {
18981865
diag.multipart_suggestion(fluent::lint_suggestion, sugg, Applicability::MaybeIncorrect);
18991866
}
1900-
diag
19011867
}
19021868

19031869
fn msg(&self) -> rustc_errors::DiagnosticMessage {

Diff for: ‎compiler/rustc_macros/src/diagnostics/diagnostic.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@ impl<'a> LintDiagnosticDerive<'a> {
175175
fn decorate_lint<'__b>(
176176
self,
177177
#diag: &'__b mut rustc_errors::DiagnosticBuilder<'__a, ()>
178-
) -> &'__b mut rustc_errors::DiagnosticBuilder<'__a, ()> {
178+
) {
179179
use rustc_errors::IntoDiagnosticArg;
180-
#implementation
180+
#implementation;
181181
}
182182

183183
fn msg(&self) -> rustc_errors::DiagnosticMessage {

Diff for: ‎compiler/rustc_middle/src/infer/canonical.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -341,13 +341,13 @@ impl<'tcx> CanonicalParamEnvCache<'tcx> {
341341
Entry::Occupied(e) => {
342342
let (canonical, var_values) = e.get();
343343
state.var_values.extend_from_slice(var_values);
344-
canonical.clone()
344+
*canonical
345345
}
346346
Entry::Vacant(e) => {
347347
let canonical = canonicalize_op(tcx, key, state);
348348
let OriginalQueryValues { var_values, universe_map } = state;
349349
assert_eq!(universe_map.len(), 1);
350-
e.insert((canonical.clone(), tcx.arena.alloc_slice(var_values)));
350+
e.insert((canonical, tcx.arena.alloc_slice(var_values)));
351351
canonical
352352
}
353353
}

Diff for: ‎compiler/rustc_middle/src/ty/consts.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ impl<'tcx> Const<'tcx> {
5959

6060
#[inline]
6161
pub fn kind(self) -> ConstKind<'tcx> {
62-
self.0.kind.clone()
62+
self.0.kind
6363
}
6464

6565
#[inline]

Diff for: ‎compiler/rustc_middle/src/ty/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ impl<'tcx> IntoKind for Ty<'tcx> {
473473
type Kind = TyKind<'tcx>;
474474

475475
fn kind(self) -> TyKind<'tcx> {
476-
self.kind().clone()
476+
*self.kind()
477477
}
478478
}
479479

Diff for: ‎compiler/rustc_mir_dataflow/src/value_analysis.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -956,11 +956,7 @@ impl Map {
956956
// The local is not tracked at all, so it does not alias anything.
957957
return;
958958
};
959-
let elems = place
960-
.projection
961-
.iter()
962-
.map(|&elem| elem.try_into())
963-
.chain(tail_elem.map(Ok).into_iter());
959+
let elems = place.projection.iter().map(|&elem| elem.try_into()).chain(tail_elem.map(Ok));
964960
for elem in elems {
965961
// A field aliases the parent place.
966962
if let Some(vi) = self.places[index].value_index {

Diff for: ‎compiler/rustc_mir_transform/src/dataflow_const_prop.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ impl<'a, 'tcx> ConstAnalysis<'a, 'tcx> {
496496
FlatSet::Elem(scalar) => {
497497
let ty = op.ty(self.local_decls, self.tcx);
498498
self.tcx.layout_of(self.param_env.and(ty)).map_or(FlatSet::Top, |layout| {
499-
FlatSet::Elem(ImmTy::from_scalar(scalar.into(), layout))
499+
FlatSet::Elem(ImmTy::from_scalar(scalar, layout))
500500
})
501501
}
502502
FlatSet::Bottom => FlatSet::Bottom,

0 commit comments

Comments
 (0)