Skip to content

Commit 7f3df57

Browse files
borsbors
committed
Auto merge of rust-lang#71201 - Dylan-DPC:rollup-23202uf, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - rust-lang#70566 (Don't bail out before linting in generic contexts.) - rust-lang#71141 (Provide better compiler output when using `?` on `Option` in fn returning `Result` and vice-versa) - rust-lang#71149 (remove an impossible branch from check_consts) - rust-lang#71179 (fix more clippy warnings) - rust-lang#71191 (Clean up E0520 explanation) Failed merges: r? @ghost
2 parents 7fb5187 + 9d28dfe commit 7f3df57

File tree

41 files changed

+320
-257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+320
-257
lines changed

Diff for: ‎src/liballoc/vec.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ impl<T> Vec<T> {
971971
}
972972

973973
let len = self.len();
974-
if !(index < len) {
974+
if index >= len {
975975
assert_failed(index, len);
976976
}
977977
unsafe {
@@ -1010,7 +1010,7 @@ impl<T> Vec<T> {
10101010
}
10111011

10121012
let len = self.len();
1013-
if !(index <= len) {
1013+
if index > len {
10141014
assert_failed(index, len);
10151015
}
10161016

@@ -1058,7 +1058,7 @@ impl<T> Vec<T> {
10581058
}
10591059

10601060
let len = self.len();
1061-
if !(index < len) {
1061+
if index >= len {
10621062
assert_failed(index, len);
10631063
}
10641064
unsafe {
@@ -1331,10 +1331,10 @@ impl<T> Vec<T> {
13311331
panic!("end drain index (is {}) should be <= len (is {})", end, len);
13321332
}
13331333

1334-
if !(start <= end) {
1334+
if start > end {
13351335
start_assert_failed(start, end);
13361336
}
1337-
if !(end <= len) {
1337+
if end > len {
13381338
end_assert_failed(end, len);
13391339
}
13401340

@@ -1432,7 +1432,7 @@ impl<T> Vec<T> {
14321432
panic!("`at` split index (is {}) should be <= len (is {})", at, len);
14331433
}
14341434

1435-
if !(at <= self.len()) {
1435+
if at > self.len() {
14361436
assert_failed(at, self.len());
14371437
}
14381438

Diff for: ‎src/librustc_builtin_macros/deriving/debug.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ fn show_substructure(cx: &mut ExtCtxt<'_>, span: Span, substr: &Substructure<'_>
6363
let span = cx.with_def_site_ctxt(span);
6464
let name = cx.expr_lit(span, ast::LitKind::Str(ident.name, ast::StrStyle::Cooked));
6565
let builder = cx.ident_of("debug_trait_builder", span);
66-
let builder_expr = cx.expr_ident(span, builder.clone());
66+
let builder_expr = cx.expr_ident(span, builder);
6767

6868
let fmt = substr.nonself_args[0].clone();
6969

Diff for: ‎src/librustc_error_codes/error_codes/E0520.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
A non-default implementation was already made on this type so it cannot be
2-
specialized further. Erroneous code example:
2+
specialized further.
3+
4+
Erroneous code example:
35

46
```compile_fail,E0520
57
#![feature(specialization)]

Diff for: ‎src/librustc_errors/emitter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2005,7 +2005,7 @@ fn emit_to_destination(
20052005
let _buffer_lock = lock::acquire_global_lock("rustc_errors");
20062006
for (pos, line) in rendered_buffer.iter().enumerate() {
20072007
for part in line {
2008-
dst.apply_style(lvl.clone(), part.style)?;
2008+
dst.apply_style(*lvl, part.style)?;
20092009
write!(dst, "{}", part.text)?;
20102010
dst.reset()?;
20112011
}

Diff for: ‎src/librustc_infer/infer/error_reporting/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
871871
return Some(());
872872
}
873873
if let &ty::Adt(def, _) = &ta.kind {
874-
let path_ = self.tcx.def_path_str(def.did.clone());
874+
let path_ = self.tcx.def_path_str(def.did);
875875
if path_ == other_path {
876876
self.highlight_outer(&mut t1_out, &mut t2_out, path, sub, i, &other_ty);
877877
return Some(());
@@ -1091,8 +1091,8 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
10911091
let sub_no_defaults_1 = self.strip_generic_default_params(def1.did, sub1);
10921092
let sub_no_defaults_2 = self.strip_generic_default_params(def2.did, sub2);
10931093
let mut values = (DiagnosticStyledString::new(), DiagnosticStyledString::new());
1094-
let path1 = self.tcx.def_path_str(def1.did.clone());
1095-
let path2 = self.tcx.def_path_str(def2.did.clone());
1094+
let path1 = self.tcx.def_path_str(def1.did);
1095+
let path2 = self.tcx.def_path_str(def2.did);
10961096
if def1.did == def2.did {
10971097
// Easy case. Replace same types with `_` to shorten the output and highlight
10981098
// the differing ones.

Diff for: ‎src/librustc_infer/infer/outlives/obligations.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ where
452452
// even though a satisfactory solution exists.
453453
let generic = GenericKind::Projection(projection_ty);
454454
let verify_bound = self.verify_bound.generic_bound(generic);
455-
self.delegate.push_verify(origin, generic.clone(), region, verify_bound);
455+
self.delegate.push_verify(origin, generic, region, verify_bound);
456456
}
457457
}
458458

Diff for: ‎src/librustc_infer/infer/outlives/verify.rs

-1
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@ impl<'cx, 'tcx> VerifyBoundCx<'cx, 'tcx> {
297297
self.collect_outlives_from_predicate_list(
298298
move |ty| ty == identity_proj,
299299
traits::elaborate_predicates(tcx, trait_predicates)
300-
.into_iter()
301300
.map(|o| o.predicate)
302301
.collect::<Vec<_>>(),
303302
)

Diff for: ‎src/librustc_mir/borrow_check/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
10561056
place: {:?}",
10571057
place_span.0
10581058
);
1059-
this.reservation_error_reported.insert(place_span.0.clone());
1059+
this.reservation_error_reported.insert(place_span.0);
10601060
}
10611061
Activation(_, activating) => {
10621062
debug!(

Diff for: ‎src/librustc_mir/borrow_check/region_infer/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
495495
// to store those. Otherwise, we'll pass in `None` to the
496496
// functions below, which will trigger them to report errors
497497
// eagerly.
498-
let mut outlives_requirements = infcx.tcx.is_closure(mir_def_id).then(|| vec![]);
498+
let mut outlives_requirements = infcx.tcx.is_closure(mir_def_id).then(Vec::new);
499499

500500
self.check_type_tests(infcx, body, outlives_requirements.as_mut(), &mut errors_buffer);
501501

Diff for: ‎src/librustc_mir/dataflow/move_paths/builder.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ impl<'b, 'a, 'tcx> Gatherer<'b, 'a, 'tcx> {
286286
// Box starts out uninitialized - need to create a separate
287287
// move-path for the interior so it will be separate from
288288
// the exterior.
289-
self.create_move_path(self.builder.tcx.mk_place_deref(place.clone()));
289+
self.create_move_path(self.builder.tcx.mk_place_deref(*place));
290290
self.gather_init(place.as_ref(), InitKind::Shallow);
291291
} else {
292292
self.gather_init(place.as_ref(), InitKind::Deep);
@@ -458,9 +458,8 @@ impl<'b, 'a, 'tcx> Gatherer<'b, 'a, 'tcx> {
458458
for offset in from..to {
459459
let elem =
460460
ProjectionElem::ConstantIndex { offset, min_length: len, from_end: false };
461-
let path = self.add_move_path(base_path, &elem, |tcx| {
462-
tcx.mk_place_elem(base_place.clone(), elem)
463-
});
461+
let path =
462+
self.add_move_path(base_path, &elem, |tcx| tcx.mk_place_elem(base_place, elem));
464463
self.record_move(place, path);
465464
}
466465
} else {

Diff for: ‎src/librustc_mir/interpret/place.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ where
549549
let n = base.len(self)?;
550550
if n < u64::from(min_length) {
551551
// This can only be reached in ConstProp and non-rustc-MIR.
552-
throw_ub!(BoundsCheckFailed { len: min_length.into(), index: n.into() });
552+
throw_ub!(BoundsCheckFailed { len: min_length.into(), index: n });
553553
}
554554

555555
let index = if from_end {

Diff for: ‎src/librustc_mir/monomorphize/collector.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ fn collect_items_rec<'tcx>(
335335
recursion_depths: &mut DefIdMap<usize>,
336336
inlining_map: MTRef<'_, MTLock<InliningMap<'tcx>>>,
337337
) {
338-
if !visited.lock_mut().insert(starting_point.clone()) {
338+
if !visited.lock_mut().insert(starting_point) {
339339
// We've been here already, no need to search again.
340340
return;
341341
}

Diff for: ‎src/librustc_mir/shim.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ impl CloneShimBuilder<'tcx> {
538538
// BB #2
539539
// `dest[i] = Clone::clone(src[beg])`;
540540
// Goto #3 if ok, #5 if unwinding happens.
541-
let dest_field = self.tcx.mk_place_index(dest.clone(), beg);
541+
let dest_field = self.tcx.mk_place_index(dest, beg);
542542
let src_field = self.tcx.mk_place_index(src, beg);
543543
self.make_clone_call(dest_field, src_field, ty, BasicBlock::new(3), BasicBlock::new(5));
544544

@@ -620,9 +620,9 @@ impl CloneShimBuilder<'tcx> {
620620
let mut previous_field = None;
621621
for (i, ity) in tys.enumerate() {
622622
let field = Field::new(i);
623-
let src_field = self.tcx.mk_place_field(src.clone(), field, ity);
623+
let src_field = self.tcx.mk_place_field(src, field, ity);
624624

625-
let dest_field = self.tcx.mk_place_field(dest.clone(), field, ity);
625+
let dest_field = self.tcx.mk_place_field(dest, field, ity);
626626

627627
// #(2i + 1) is the cleanup block for the previous clone operation
628628
let cleanup_block = self.block_index_offset(1);
@@ -633,7 +633,7 @@ impl CloneShimBuilder<'tcx> {
633633
// BB #(2i)
634634
// `dest.i = Clone::clone(&src.i);`
635635
// Goto #(2i + 2) if ok, #(2i + 1) if unwinding happens.
636-
self.make_clone_call(dest_field.clone(), src_field, ity, next_block, cleanup_block);
636+
self.make_clone_call(dest_field, src_field, ity, next_block, cleanup_block);
637637

638638
// BB #(2i + 1) (cleanup)
639639
if let Some((previous_field, previous_cleanup)) = previous_field.take() {

Diff for: ‎src/librustc_mir/transform/check_consts/ops.rs

-10
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,6 @@ impl NonConstOp for FnCallNonConst {
9090
}
9191
}
9292

93-
/// A function call where the callee is not a function definition or function pointer, e.g. a
94-
/// closure.
95-
///
96-
/// This can be subdivided in the future to produce a better error message.
97-
#[derive(Debug)]
98-
pub struct FnCallOther;
99-
impl NonConstOp for FnCallOther {
100-
const IS_SUPPORTED_IN_MIRI: bool = false;
101-
}
102-
10393
/// A call to a `#[unstable]` const fn or `#[rustc_const_unstable]` function.
10494
///
10595
/// Contains the name of the feature that would allow the use of this function.

Diff for: ‎src/librustc_mir/transform/check_consts/validation.rs

+5-6
Original file line numberDiff line numberDiff line change
@@ -495,11 +495,11 @@ impl Visitor<'tcx> for Validator<'_, 'mir, 'tcx> {
495495
}
496496
}
497497

498-
fn visit_terminator_kind(&mut self, kind: &TerminatorKind<'tcx>, location: Location) {
499-
trace!("visit_terminator_kind: kind={:?} location={:?}", kind, location);
500-
self.super_terminator_kind(kind, location);
498+
fn visit_terminator(&mut self, terminator: &Terminator<'tcx>, location: Location) {
499+
trace!("visit_terminator: terminator={:?} location={:?}", terminator, location);
500+
self.super_terminator(terminator, location);
501501

502-
match kind {
502+
match &terminator.kind {
503503
TerminatorKind::Call { func, .. } => {
504504
let fn_ty = func.ty(*self.body, self.tcx);
505505

@@ -511,8 +511,7 @@ impl Visitor<'tcx> for Validator<'_, 'mir, 'tcx> {
511511
return;
512512
}
513513
_ => {
514-
self.check_op(ops::FnCallOther);
515-
return;
514+
span_bug!(terminator.source_info.span, "invalid callee of type {:?}", fn_ty)
516515
}
517516
};
518517

Diff for: ‎src/librustc_mir/transform/const_prop.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -581,11 +581,6 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
581581
return None;
582582
}
583583

584-
// FIXME we need to revisit this for #67176
585-
if rvalue.needs_subst() {
586-
return None;
587-
}
588-
589584
// Perform any special handling for specific Rvalue types.
590585
// Generally, checks here fall into one of two categories:
591586
// 1. Additional checking to provide useful lints to the user
@@ -626,6 +621,11 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
626621
_ => {}
627622
}
628623

624+
// FIXME we need to revisit this for #67176
625+
if rvalue.needs_subst() {
626+
return None;
627+
}
628+
629629
self.use_ecx(|this| {
630630
trace!("calling eval_rvalue_into_place(rvalue = {:?}, place = {:?})", rvalue, place);
631631
this.ecx.eval_rvalue_into_place(rvalue, place)?;

Diff for: ‎src/librustc_mir/transform/inline.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ impl Inliner<'tcx> {
582582
let tuple_tmp_args = tuple_tys.iter().enumerate().map(|(i, ty)| {
583583
// This is e.g., `tuple_tmp.0` in our example above.
584584
let tuple_field =
585-
Operand::Move(tcx.mk_place_field(tuple.clone(), Field::new(i), ty.expect_ty()));
585+
Operand::Move(tcx.mk_place_field(tuple, Field::new(i), ty.expect_ty()));
586586

587587
// Spill to a local to make e.g., `tmp0`.
588588
self.create_temp_if_necessary(tuple_field, callsite, caller_body)

Diff for: ‎src/librustc_mir/util/aggregate.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ pub fn expand_aggregate<'tcx>(
5656
let offset = i as u32;
5757
assert_eq!(offset as usize, i);
5858
tcx.mk_place_elem(
59-
lhs.clone(),
59+
lhs,
6060
ProjectionElem::ConstantIndex {
6161
offset,
6262
// FIXME(eddyb) `min_length` doesn't appear to be used.
@@ -66,7 +66,7 @@ pub fn expand_aggregate<'tcx>(
6666
)
6767
} else {
6868
let field = Field::new(active_field_index.unwrap_or(i));
69-
tcx.mk_place_field(lhs.clone(), field, ty)
69+
tcx.mk_place_field(lhs, field, ty)
7070
};
7171
Statement { source_info, kind: StatementKind::Assign(box (lhs_field, Rvalue::Use(op))) }
7272
})

Diff for: ‎src/librustc_mir/util/elaborate_drops.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ where
212212
assert_eq!(self.elaborator.param_env().reveal, Reveal::All);
213213
let field_ty =
214214
tcx.normalize_erasing_regions(self.elaborator.param_env(), f.ty(tcx, substs));
215-
(tcx.mk_place_field(base_place.clone(), field, field_ty), subpath)
215+
(tcx.mk_place_field(base_place, field, field_ty), subpath)
216216
})
217217
.collect()
218218
}
@@ -340,7 +340,7 @@ where
340340
.enumerate()
341341
.map(|(i, &ty)| {
342342
(
343-
self.tcx().mk_place_field(self.place.clone(), Field::new(i), ty),
343+
self.tcx().mk_place_field(self.place, Field::new(i), ty),
344344
self.elaborator.field_subpath(self.path, Field::new(i)),
345345
)
346346
})
@@ -353,7 +353,7 @@ where
353353
fn open_drop_for_box(&mut self, adt: &'tcx ty::AdtDef, substs: SubstsRef<'tcx>) -> BasicBlock {
354354
debug!("open_drop_for_box({:?}, {:?}, {:?})", self, adt, substs);
355355

356-
let interior = self.tcx().mk_place_deref(self.place.clone());
356+
let interior = self.tcx().mk_place_deref(self.place);
357357
let interior_path = self.elaborator.deref_subpath(self.path);
358358

359359
let succ = self.succ; // FIXME(#43234)
@@ -434,7 +434,7 @@ where
434434

435435
if let Some(variant_path) = subpath {
436436
let base_place = tcx.mk_place_elem(
437-
self.place.clone(),
437+
self.place,
438438
ProjectionElem::Downcast(Some(variant.ident.name), variant_index),
439439
);
440440
let fields = self.move_paths_for_fields(base_place, variant_path, &variant, substs);
@@ -622,7 +622,7 @@ where
622622
(Rvalue::Use(copy(cur.into())), Rvalue::BinaryOp(BinOp::Offset, move_(cur.into()), one))
623623
} else {
624624
(
625-
Rvalue::AddressOf(Mutability::Mut, tcx.mk_place_index(self.place.clone(), cur)),
625+
Rvalue::AddressOf(Mutability::Mut, tcx.mk_place_index(self.place, cur)),
626626
Rvalue::BinaryOp(BinOp::Add, move_(cur.into()), one),
627627
)
628628
};
@@ -654,7 +654,7 @@ where
654654
self.elaborator.patch().patch_terminator(
655655
drop_block,
656656
TerminatorKind::Drop {
657-
location: tcx.mk_place_deref(ptr.clone()),
657+
location: tcx.mk_place_deref(ptr),
658658
target: loop_block,
659659
unwind: unwind.into_option(),
660660
},
@@ -682,7 +682,7 @@ where
682682
.map(|i| {
683683
(
684684
tcx.mk_place_elem(
685-
self.place.clone(),
685+
self.place,
686686
ProjectionElem::ConstantIndex {
687687
offset: i,
688688
min_length: size,
@@ -719,8 +719,8 @@ where
719719
switch_ty: tcx.types.usize,
720720
values: From::from(USIZE_SWITCH_ZERO),
721721
targets: vec![
722-
self.drop_loop_pair(ety, false, len.clone()),
723-
self.drop_loop_pair(ety, true, len.clone()),
722+
self.drop_loop_pair(ety, false, len),
723+
self.drop_loop_pair(ety, true, len),
724724
],
725725
},
726726
}),
@@ -912,7 +912,7 @@ where
912912
.map(|(i, f)| {
913913
let field = Field::new(i);
914914
let field_ty = f.ty(tcx, substs);
915-
Operand::Move(tcx.mk_place_field(self.place.clone(), field, field_ty))
915+
Operand::Move(tcx.mk_place_field(self.place, field, field_ty))
916916
})
917917
.collect();
918918

Diff for: ‎src/librustc_mir_build/build/block.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use crate::build::matches::ArmHasGuard;
22
use crate::build::ForGuard::OutsideGuard;
33
use crate::build::{BlockAnd, BlockAndExtension, BlockFrame, Builder};
44
use crate::hair::*;
5-
use rustc_middle::mir::*;
65
use rustc_hir as hir;
6+
use rustc_middle::mir::*;
77
use rustc_span::Span;
88

99
impl<'a, 'tcx> Builder<'a, 'tcx> {
@@ -29,7 +29,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
2929
// This is a `break`-able block
3030
let exit_block = this.cfg.start_new_block();
3131
let block_exit =
32-
this.in_breakable_scope(None, exit_block, destination.clone(), |this| {
32+
this.in_breakable_scope(None, exit_block, destination, |this| {
3333
this.ast_block_stmts(destination, block, span, stmts, expr, safety_mode)
3434
});
3535
this.cfg.goto(unpack!(block_exit), source_info, exit_block);

0 commit comments

Comments
 (0)