Skip to content

Commit d5e7f47

Browse files
borsbors
committed
Auto merge of #99346 - matthiaskrgr:rollup-p4dl1qt, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #98582 (Allow destructuring opaque types in their defining scopes) - #99213 (migrate some of `rustc_passes::check_attr`'s diagnostics and derive improvements) - #99258 (Provide structured suggestion for dropped temp value) - #99259 (interpret/visitor: support visiting with a PlaceTy) - #99287 ([rustdoc-json] JSON no longer inlines) - #99290 (Revert "Highlight conflicting param-env candidates") - #99316 (docs: add missing word) - #99317 (Borrow Vec<T, A> as [T]) - #99323 (Fix flakyness of GUI tests) - #99342 (Avoid some `Symbol` to `String` conversions) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 7210e46 + 6277ac2 commit d5e7f47

File tree

165 files changed

+2270
-1215
lines changed

Some content is hidden

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

165 files changed

+2270
-1215
lines changed

Diff for: ‎Cargo.lock

+1
Original file line numberDiff line numberDiff line change
@@ -4239,6 +4239,7 @@ dependencies = [
42394239
"rustc_hir",
42404240
"rustc_index",
42414241
"rustc_lexer",
4242+
"rustc_macros",
42424243
"rustc_middle",
42434244
"rustc_serialize",
42444245
"rustc_session",

Diff for: ‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

+71-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use rustc_errors::{
77
};
88
use rustc_hir as hir;
99
use rustc_hir::def_id::DefId;
10-
use rustc_hir::intravisit::{walk_expr, Visitor};
10+
use rustc_hir::intravisit::{walk_block, walk_expr, Visitor};
1111
use rustc_hir::{AsyncGeneratorKind, GeneratorKind};
1212
use rustc_infer::infer::TyCtxtInferExt;
1313
use rustc_infer::traits::ObligationCause;
@@ -23,7 +23,7 @@ use rustc_middle::ty::{
2323
use rustc_mir_dataflow::move_paths::{InitKind, MoveOutIndex, MovePathIndex};
2424
use rustc_span::hygiene::DesugaringKind;
2525
use rustc_span::symbol::sym;
26-
use rustc_span::{BytePos, Span};
26+
use rustc_span::{BytePos, Span, Symbol};
2727
use rustc_trait_selection::infer::InferCtxtExt;
2828
use rustc_trait_selection::traits::TraitEngineExt as _;
2929

@@ -1227,8 +1227,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
12271227
from_closure: false,
12281228
region_name:
12291229
RegionName {
1230-
source:
1231-
RegionNameSource::AnonRegionFromUpvar(upvar_span, ref upvar_name),
1230+
source: RegionNameSource::AnonRegionFromUpvar(upvar_span, upvar_name),
12321231
..
12331232
},
12341233
span,
@@ -1500,7 +1499,70 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
15001499
| BorrowExplanation::UsedLaterInLoop(..)
15011500
| BorrowExplanation::UsedLaterWhenDropped { .. } => {
15021501
// Only give this note and suggestion if it could be relevant.
1503-
err.note("consider using a `let` binding to create a longer lived value");
1502+
let sm = self.infcx.tcx.sess.source_map();
1503+
let mut suggested = false;
1504+
let msg = "consider using a `let` binding to create a longer lived value";
1505+
1506+
/// We check that there's a single level of block nesting to ensure always correct
1507+
/// suggestions. If we don't, then we only provide a free-form message to avoid
1508+
/// misleading users in cases like `src/test/ui/nll/borrowed-temporary-error.rs`.
1509+
/// We could expand the analysis to suggest hoising all of the relevant parts of
1510+
/// the users' code to make the code compile, but that could be too much.
1511+
struct NestedStatementVisitor {
1512+
span: Span,
1513+
current: usize,
1514+
found: usize,
1515+
}
1516+
1517+
impl<'tcx> Visitor<'tcx> for NestedStatementVisitor {
1518+
fn visit_block(&mut self, block: &hir::Block<'tcx>) {
1519+
self.current += 1;
1520+
walk_block(self, block);
1521+
self.current -= 1;
1522+
}
1523+
fn visit_expr(&mut self, expr: &hir::Expr<'tcx>) {
1524+
if self.span == expr.span {
1525+
self.found = self.current;
1526+
}
1527+
walk_expr(self, expr);
1528+
}
1529+
}
1530+
let source_info = self.body.source_info(location);
1531+
if let Some(scope) = self.body.source_scopes.get(source_info.scope)
1532+
&& let ClearCrossCrate::Set(scope_data) = &scope.local_data
1533+
&& let Some(node) = self.infcx.tcx.hir().find(scope_data.lint_root)
1534+
&& let Some(id) = node.body_id()
1535+
&& let hir::ExprKind::Block(block, _) = self.infcx.tcx.hir().body(id).value.kind
1536+
{
1537+
for stmt in block.stmts {
1538+
let mut visitor = NestedStatementVisitor {
1539+
span: proper_span,
1540+
current: 0,
1541+
found: 0,
1542+
};
1543+
visitor.visit_stmt(stmt);
1544+
if visitor.found == 0
1545+
&& stmt.span.contains(proper_span)
1546+
&& let Some(p) = sm.span_to_margin(stmt.span)
1547+
&& let Ok(s) = sm.span_to_snippet(proper_span)
1548+
{
1549+
let addition = format!("let binding = {};\n{}", s, " ".repeat(p));
1550+
err.multipart_suggestion_verbose(
1551+
msg,
1552+
vec![
1553+
(stmt.span.shrink_to_lo(), addition),
1554+
(proper_span, "binding".to_string()),
1555+
],
1556+
Applicability::MaybeIncorrect,
1557+
);
1558+
suggested = true;
1559+
break;
1560+
}
1561+
}
1562+
}
1563+
if !suggested {
1564+
err.note(msg);
1565+
}
15041566
}
15051567
_ => {}
15061568
}
@@ -1699,7 +1761,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
16991761
borrow_span: Span,
17001762
name: &Option<String>,
17011763
upvar_span: Span,
1702-
upvar_name: &str,
1764+
upvar_name: Symbol,
17031765
escape_span: Span,
17041766
) -> DiagnosticBuilder<'cx, ErrorGuaranteed> {
17051767
let tcx = self.infcx.tcx;
@@ -2093,7 +2155,9 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
20932155
}
20942156
StorageDeadOrDrop::Destructor(_) => kind,
20952157
},
2096-
ProjectionElem::Field(..) | ProjectionElem::Downcast(..) => {
2158+
ProjectionElem::OpaqueCast { .. }
2159+
| ProjectionElem::Field(..)
2160+
| ProjectionElem::Downcast(..) => {
20972161
match place_ty.ty.kind() {
20982162
ty::Adt(def, _) if def.has_dtor(tcx) => {
20992163
// Report the outermost adt with a destructor

Diff for: ‎compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use rustc_middle::mir::{
1212
};
1313
use rustc_middle::ty::adjustment::PointerCast;
1414
use rustc_middle::ty::{self, RegionVid, TyCtxt};
15-
use rustc_span::symbol::Symbol;
15+
use rustc_span::symbol::{kw, Symbol};
1616
use rustc_span::{sym, DesugaringKind, Span};
1717

1818
use crate::region_infer::BlameConstraint;
@@ -282,7 +282,7 @@ impl<'tcx> BorrowExplanation<'tcx> {
282282
) {
283283
if let ConstraintCategory::OpaqueType = category {
284284
let suggestable_name =
285-
if region_name.was_named() { region_name.to_string() } else { "'_".to_string() };
285+
if region_name.was_named() { region_name.name } else { kw::UnderscoreLifetime };
286286

287287
let msg = format!(
288288
"you can add a bound to the {}to make it last less than `'static` and match `{}`",

Diff for: ‎compiler/rustc_borrowck/src/diagnostics/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
226226
}
227227
ProjectionElem::Downcast(..) if including_downcast.0 => return None,
228228
ProjectionElem::Downcast(..) => (),
229+
ProjectionElem::OpaqueCast(..) => (),
229230
ProjectionElem::Field(field, _ty) => {
230231
// FIXME(project-rfc_2229#36): print capture precisely here.
231232
if let Some(field) = self.is_upvar_field_projection(PlaceRef {
@@ -286,6 +287,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
286287
PlaceRef { local, projection: proj_base }.ty(self.body, self.infcx.tcx)
287288
}
288289
ProjectionElem::Downcast(..) => place.ty(self.body, self.infcx.tcx),
290+
ProjectionElem::OpaqueCast(ty) => PlaceTy::from_ty(*ty),
289291
ProjectionElem::Field(_, field_type) => PlaceTy::from_ty(*field_type),
290292
},
291293
};

Diff for: ‎compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
169169
..,
170170
ProjectionElem::Index(_)
171171
| ProjectionElem::ConstantIndex { .. }
172+
| ProjectionElem::OpaqueCast { .. }
172173
| ProjectionElem::Subslice { .. }
173174
| ProjectionElem::Downcast(..),
174175
],

Diff for: ‎compiler/rustc_borrowck/src/diagnostics/region_errors.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ use rustc_middle::ty::subst::InternalSubsts;
1919
use rustc_middle::ty::Region;
2020
use rustc_middle::ty::TypeVisitor;
2121
use rustc_middle::ty::{self, RegionVid, Ty};
22-
use rustc_span::symbol::sym;
23-
use rustc_span::symbol::Ident;
22+
use rustc_span::symbol::{kw, sym, Ident};
2423
use rustc_span::Span;
2524

2625
use crate::borrowck_errors;
@@ -758,7 +757,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
758757
return;
759758
};
760759

761-
let lifetime = if f.has_name() { fr_name.to_string() } else { "'_".to_string() };
760+
let lifetime = if f.has_name() { fr_name.name } else { kw::UnderscoreLifetime };
762761

763762
let arg = match param.param.pat.simple_ident() {
764763
Some(simple_ident) => format!("argument `{}`", simple_ident),
@@ -770,7 +769,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
770769
self.infcx.tcx,
771770
diag,
772771
fn_returns,
773-
lifetime,
772+
lifetime.to_string(),
774773
Some(arg),
775774
captures,
776775
Some((param.param_ty_span, param.param_ty.to_string())),

Diff for: ‎compiler/rustc_borrowck/src/diagnostics/region_name.rs

+7-10
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ pub(crate) enum RegionNameSource {
3434
/// The `'static` region.
3535
Static,
3636
/// The free region corresponding to the environment of a closure.
37-
SynthesizedFreeEnvRegion(Span, String),
37+
SynthesizedFreeEnvRegion(Span, &'static str),
3838
/// The region corresponding to an argument.
3939
AnonRegionFromArgument(RegionNameHighlight),
4040
/// The region corresponding to a closure upvar.
41-
AnonRegionFromUpvar(Span, String),
41+
AnonRegionFromUpvar(Span, Symbol),
4242
/// The region corresponding to the return type of a closure.
43-
AnonRegionFromOutput(RegionNameHighlight, String),
43+
AnonRegionFromOutput(RegionNameHighlight, &'static str),
4444
/// The region from a type yielded by a generator.
4545
AnonRegionFromYieldTy(Span, String),
4646
/// An anonymous region from an async fn.
@@ -110,7 +110,7 @@ impl RegionName {
110110
}
111111
RegionNameSource::SynthesizedFreeEnvRegion(span, note) => {
112112
diag.span_label(*span, format!("lifetime `{self}` represents this closure's body"));
113-
diag.note(note);
113+
diag.note(*note);
114114
}
115115
RegionNameSource::AnonRegionFromArgument(RegionNameHighlight::CannotMatchHirTy(
116116
span,
@@ -350,10 +350,7 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
350350

351351
Some(RegionName {
352352
name: region_name,
353-
source: RegionNameSource::SynthesizedFreeEnvRegion(
354-
fn_decl_span,
355-
note.to_string(),
356-
),
353+
source: RegionNameSource::SynthesizedFreeEnvRegion(fn_decl_span, note),
357354
})
358355
}
359356

@@ -678,7 +675,7 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
678675

679676
Some(RegionName {
680677
name: region_name,
681-
source: RegionNameSource::AnonRegionFromUpvar(upvar_span, upvar_name.to_string()),
678+
source: RegionNameSource::AnonRegionFromUpvar(upvar_span, upvar_name),
682679
})
683680
}
684681

@@ -756,7 +753,7 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
756753

757754
Some(RegionName {
758755
name: self.synthesize_region_name(),
759-
source: RegionNameSource::AnonRegionFromOutput(highlight, mir_description.to_string()),
756+
source: RegionNameSource::AnonRegionFromOutput(highlight, mir_description),
760757
})
761758
}
762759

Diff for: ‎compiler/rustc_borrowck/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1788,6 +1788,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
17881788
for (place_base, elem) in place.iter_projections().rev() {
17891789
match elem {
17901790
ProjectionElem::Index(_/*operand*/) |
1791+
ProjectionElem::OpaqueCast(_) |
17911792
ProjectionElem::ConstantIndex { .. } |
17921793
// assigning to P[i] requires P to be valid.
17931794
ProjectionElem::Downcast(_/*adt_def*/, _/*variant_idx*/) =>
@@ -2179,6 +2180,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
21792180
| ProjectionElem::Index(..)
21802181
| ProjectionElem::ConstantIndex { .. }
21812182
| ProjectionElem::Subslice { .. }
2183+
| ProjectionElem::OpaqueCast { .. }
21822184
| ProjectionElem::Downcast(..) => {
21832185
let upvar_field_projection = self.is_upvar_field_projection(place);
21842186
if let Some(field) = upvar_field_projection {

Diff for: ‎compiler/rustc_borrowck/src/places_conflict.rs

+13
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ fn place_components_conflict<'tcx>(
255255
| (ProjectionElem::Index { .. }, _, _)
256256
| (ProjectionElem::ConstantIndex { .. }, _, _)
257257
| (ProjectionElem::Subslice { .. }, _, _)
258+
| (ProjectionElem::OpaqueCast { .. }, _, _)
258259
| (ProjectionElem::Downcast { .. }, _, _) => {
259260
// Recursive case. This can still be disjoint on a
260261
// further iteration if this a shallow access and
@@ -322,6 +323,17 @@ fn place_projection_conflict<'tcx>(
322323
debug!("place_element_conflict: DISJOINT-OR-EQ-DEREF");
323324
Overlap::EqualOrDisjoint
324325
}
326+
(ProjectionElem::OpaqueCast(v1), ProjectionElem::OpaqueCast(v2)) => {
327+
if v1 == v2 {
328+
// same type - recur.
329+
debug!("place_element_conflict: DISJOINT-OR-EQ-OPAQUE");
330+
Overlap::EqualOrDisjoint
331+
} else {
332+
// Different types. Disjoint!
333+
debug!("place_element_conflict: DISJOINT-OPAQUE");
334+
Overlap::Disjoint
335+
}
336+
}
325337
(ProjectionElem::Field(f1, _), ProjectionElem::Field(f2, _)) => {
326338
if f1 == f2 {
327339
// same field (e.g., `a.y` vs. `a.y`) - recur.
@@ -525,6 +537,7 @@ fn place_projection_conflict<'tcx>(
525537
| ProjectionElem::Field(..)
526538
| ProjectionElem::Index(..)
527539
| ProjectionElem::ConstantIndex { .. }
540+
| ProjectionElem::OpaqueCast { .. }
528541
| ProjectionElem::Subslice { .. }
529542
| ProjectionElem::Downcast(..),
530543
_,

Diff for: ‎compiler/rustc_borrowck/src/prefixes.rs

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ impl<'cx, 'tcx> Iterator for Prefixes<'cx, 'tcx> {
8181
}
8282
ProjectionElem::Downcast(..)
8383
| ProjectionElem::Subslice { .. }
84+
| ProjectionElem::OpaqueCast { .. }
8485
| ProjectionElem::ConstantIndex { .. }
8586
| ProjectionElem::Index(_) => {
8687
cursor = cursor_base;

Diff for: ‎compiler/rustc_borrowck/src/type_check/mod.rs

+16-1
Original file line numberDiff line numberDiff line change
@@ -790,6 +790,19 @@ impl<'a, 'b, 'tcx> TypeVerifier<'a, 'b, 'tcx> {
790790
}
791791
PlaceTy::from_ty(fty)
792792
}
793+
ProjectionElem::OpaqueCast(ty) => {
794+
let ty = self.sanitize_type(place, ty);
795+
let ty = self.cx.normalize(ty, location);
796+
self.cx
797+
.eq_types(
798+
base.ty,
799+
ty,
800+
location.to_locations(),
801+
ConstraintCategory::TypeAnnotation,
802+
)
803+
.unwrap();
804+
PlaceTy::from_ty(ty)
805+
}
793806
}
794807
}
795808

@@ -1195,10 +1208,11 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
11951208
tcx,
11961209
self.param_env,
11971210
proj,
1198-
|this, field, ()| {
1211+
|this, field, _| {
11991212
let ty = this.field_ty(tcx, field);
12001213
self.normalize(ty, locations)
12011214
},
1215+
|_, _| unreachable!(),
12021216
);
12031217
curr_projected_ty = projected_ty;
12041218
}
@@ -2493,6 +2507,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
24932507
}
24942508
ProjectionElem::Field(..)
24952509
| ProjectionElem::Downcast(..)
2510+
| ProjectionElem::OpaqueCast(..)
24962511
| ProjectionElem::Index(..)
24972512
| ProjectionElem::ConstantIndex { .. }
24982513
| ProjectionElem::Subslice { .. } => {

Diff for: ‎compiler/rustc_codegen_cranelift/src/base.rs

+1
Original file line numberDiff line numberDiff line change
@@ -825,6 +825,7 @@ pub(crate) fn codegen_place<'tcx>(
825825
cplace = cplace.place_deref(fx);
826826
}
827827
}
828+
PlaceElem::OpaqueCast(ty) => cplace = cplace.place_opaque_cast(fx, ty),
828829
PlaceElem::Field(field, _ty) => {
829830
cplace = cplace.place_field(fx, field);
830831
}

Diff for: ‎compiler/rustc_codegen_cranelift/src/value_and_place.rs

+8
Original file line numberDiff line numberDiff line change
@@ -615,6 +615,14 @@ impl<'tcx> CPlace<'tcx> {
615615
}
616616
}
617617

618+
pub(crate) fn place_opaque_cast(
619+
self,
620+
fx: &mut FunctionCx<'_, '_, 'tcx>,
621+
ty: Ty<'tcx>,
622+
) -> CPlace<'tcx> {
623+
CPlace { inner: self.inner, layout: fx.layout_of(ty) }
624+
}
625+
618626
pub(crate) fn place_field(
619627
self,
620628
fx: &mut FunctionCx<'_, '_, 'tcx>,

0 commit comments

Comments
 (0)