Skip to content

Commit d9ae43c

Browse files
borsbors
committed
Auto merge of #121469 - matthiaskrgr:rollup-oaoxuo2, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #120598 (No need to `validate_alias_bound_self_from_param_env` in `assemble_alias_bound_candidates`) - #121386 (test that we do not support higher-ranked regions in opaque type inference) - #121393 (match lowering: Introduce a `TestCase` enum to replace most matching on `PatKind`) - #121401 (Fix typo in serialized.rs) - #121427 (Fix panic when compiling `Rocket`.) - #121439 (Fix typo in metadata.rs doc comment) - #121441 (`DefId` to `LocalDefId`) - #121452 (Add new maintainers to nto-qnx.md) r? `@ghost` `@rustbot` modify labels: rollup
2 parents f62f490 + 4537e6d commit d9ae43c

File tree

36 files changed

+690
-485
lines changed

36 files changed

+690
-485
lines changed

Diff for: ‎compiler/rustc_borrowck/src/region_infer/opaque_types.rs

+8-6
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,14 @@ impl<'tcx> RegionInferenceContext<'tcx> {
153153
if let Some(prev) = result.get_mut(&opaque_type_key.def_id) {
154154
if prev.ty != ty {
155155
let guar = ty.error_reported().err().unwrap_or_else(|| {
156-
prev.report_mismatch(
157-
&OpaqueHiddenType { ty, span: concrete_type.span },
158-
opaque_type_key.def_id,
159-
infcx.tcx,
160-
)
161-
.emit()
156+
let (Ok(e) | Err(e)) = prev
157+
.build_mismatch_error(
158+
&OpaqueHiddenType { ty, span: concrete_type.span },
159+
opaque_type_key.def_id,
160+
infcx.tcx,
161+
)
162+
.map(|d| d.emit());
163+
e
162164
});
163165
prev.ty = Ty::new_error(infcx.tcx, guar);
164166
}

Diff for: ‎compiler/rustc_expand/src/proc_macro_server.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ impl server::FreeFunctions for Rustc<'_, '_> {
510510

511511
fn emit_diagnostic(&mut self, diagnostic: Diagnostic<Self::Span>) {
512512
let message = rustc_errors::DiagnosticMessage::from(diagnostic.message);
513-
let mut diag: DiagnosticBuilder<'_, rustc_errors::ErrorGuaranteed> =
513+
let mut diag: DiagnosticBuilder<'_, ()> =
514514
DiagnosticBuilder::new(&self.sess().dcx, diagnostic.level.to_internal(), message);
515515
diag.span(MultiSpan::from_spans(diagnostic.spans));
516516
for child in diagnostic.children {

Diff for: ‎compiler/rustc_hir_analysis/src/check/check.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ fn sanity_check_found_hidden_type<'tcx>(
477477
} else {
478478
let span = tcx.def_span(key.def_id);
479479
let other = ty::OpaqueHiddenType { ty: hidden_ty, span };
480-
Err(ty.report_mismatch(&other, key.def_id, tcx).emit())
480+
Err(ty.build_mismatch_error(&other, key.def_id, tcx)?.emit())
481481
}
482482
}
483483

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1027,7 +1027,7 @@ fn adt_def(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::AdtDef<'_> {
10271027
let repr = if is_anonymous {
10281028
tcx.adt_def(tcx.local_parent(def_id)).repr()
10291029
} else {
1030-
tcx.repr_options_of_def(def_id.to_def_id())
1030+
tcx.repr_options_of_def(def_id)
10311031
};
10321032
let (kind, variants) = match &item.kind {
10331033
ItemKind::Enum(def, _) => {

Diff for: ‎compiler/rustc_hir_analysis/src/collect/type_of/opaque.rs

+25-18
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ pub(super) fn find_opaque_ty_constraints_for_impl_trait_in_assoc_type(
5858
// Only check against typeck if we didn't already error
5959
if !hidden.ty.references_error() {
6060
for concrete_type in locator.typeck_types {
61-
if concrete_type.ty != tcx.erase_regions(hidden.ty)
62-
&& !(concrete_type, hidden).references_error()
63-
{
64-
hidden.report_mismatch(&concrete_type, def_id, tcx).emit();
61+
if concrete_type.ty != tcx.erase_regions(hidden.ty) {
62+
if let Ok(d) = hidden.build_mismatch_error(&concrete_type, def_id, tcx) {
63+
d.emit();
64+
}
6565
}
6666
}
6767
}
@@ -134,10 +134,10 @@ pub(super) fn find_opaque_ty_constraints_for_tait(tcx: TyCtxt<'_>, def_id: Local
134134
// Only check against typeck if we didn't already error
135135
if !hidden.ty.references_error() {
136136
for concrete_type in locator.typeck_types {
137-
if concrete_type.ty != tcx.erase_regions(hidden.ty)
138-
&& !(concrete_type, hidden).references_error()
139-
{
140-
hidden.report_mismatch(&concrete_type, def_id, tcx).emit();
137+
if concrete_type.ty != tcx.erase_regions(hidden.ty) {
138+
if let Ok(d) = hidden.build_mismatch_error(&concrete_type, def_id, tcx) {
139+
d.emit();
140+
}
141141
}
142142
}
143143
}
@@ -287,8 +287,10 @@ impl TaitConstraintLocator<'_> {
287287
if let Some(&concrete_type) = borrowck_results.concrete_opaque_types.get(&self.def_id) {
288288
debug!(?concrete_type, "found constraint");
289289
if let Some(prev) = &mut self.found {
290-
if concrete_type.ty != prev.ty && !(concrete_type, prev.ty).references_error() {
291-
let guar = prev.report_mismatch(&concrete_type, self.def_id, self.tcx).emit();
290+
if concrete_type.ty != prev.ty {
291+
let (Ok(guar) | Err(guar)) = prev
292+
.build_mismatch_error(&concrete_type, self.def_id, self.tcx)
293+
.map(|d| d.emit());
292294
prev.ty = Ty::new_error(self.tcx, guar);
293295
}
294296
} else {
@@ -361,11 +363,13 @@ pub(super) fn find_opaque_ty_constraints_for_rpit<'tcx>(
361363
hidden_type.remap_generic_params_to_declaration_params(opaque_type_key, tcx, true),
362364
);
363365
if let Some(prev) = &mut hir_opaque_ty {
364-
if concrete_type.ty != prev.ty && !(concrete_type, prev.ty).references_error() {
365-
prev.report_mismatch(&concrete_type, def_id, tcx).stash(
366-
tcx.def_span(opaque_type_key.def_id),
367-
StashKey::OpaqueHiddenTypeMismatch,
368-
);
366+
if concrete_type.ty != prev.ty {
367+
if let Ok(d) = prev.build_mismatch_error(&concrete_type, def_id, tcx) {
368+
d.stash(
369+
tcx.def_span(opaque_type_key.def_id),
370+
StashKey::OpaqueHiddenTypeMismatch,
371+
);
372+
}
369373
}
370374
} else {
371375
hir_opaque_ty = Some(concrete_type);
@@ -436,9 +440,12 @@ impl RpitConstraintChecker<'_> {
436440

437441
debug!(?concrete_type, "found constraint");
438442

439-
if concrete_type.ty != self.found.ty && !(concrete_type, self.found).references_error()
440-
{
441-
self.found.report_mismatch(&concrete_type, self.def_id, self.tcx).emit();
443+
if concrete_type.ty != self.found.ty {
444+
if let Ok(d) =
445+
self.found.build_mismatch_error(&concrete_type, self.def_id, self.tcx)
446+
{
447+
d.emit();
448+
}
442449
}
443450
}
444451
}

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

+7-3
Original file line numberDiff line numberDiff line change
@@ -589,12 +589,16 @@ impl<'cx, 'tcx> WritebackCx<'cx, 'tcx> {
589589
&& last_opaque_ty.ty != hidden_type.ty
590590
{
591591
assert!(!self.fcx.next_trait_solver());
592-
hidden_type
593-
.report_mismatch(&last_opaque_ty, opaque_type_key.def_id, self.tcx())
594-
.stash(
592+
if let Ok(d) = hidden_type.build_mismatch_error(
593+
&last_opaque_ty,
594+
opaque_type_key.def_id,
595+
self.tcx(),
596+
) {
597+
d.stash(
595598
self.tcx().def_span(opaque_type_key.def_id),
596599
StashKey::OpaqueHiddenTypeMismatch,
597600
);
601+
}
598602
}
599603
}
600604
}

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

+8-6
Original file line numberDiff line numberDiff line change
@@ -840,31 +840,32 @@ pub struct OpaqueHiddenType<'tcx> {
840840
}
841841

842842
impl<'tcx> OpaqueHiddenType<'tcx> {
843-
pub fn report_mismatch(
843+
pub fn build_mismatch_error(
844844
&self,
845845
other: &Self,
846846
opaque_def_id: LocalDefId,
847847
tcx: TyCtxt<'tcx>,
848-
) -> DiagnosticBuilder<'tcx> {
848+
) -> Result<DiagnosticBuilder<'tcx>, ErrorGuaranteed> {
849849
if let Some(diag) = tcx
850850
.sess
851851
.dcx()
852852
.steal_diagnostic(tcx.def_span(opaque_def_id), StashKey::OpaqueHiddenTypeMismatch)
853853
{
854854
diag.cancel();
855855
}
856+
(self.ty, other.ty).error_reported()?;
856857
// Found different concrete types for the opaque type.
857858
let sub_diag = if self.span == other.span {
858859
TypeMismatchReason::ConflictType { span: self.span }
859860
} else {
860861
TypeMismatchReason::PreviousUse { span: self.span }
861862
};
862-
tcx.dcx().create_err(OpaqueHiddenTypeMismatch {
863+
Ok(tcx.dcx().create_err(OpaqueHiddenTypeMismatch {
863864
self_ty: self.ty,
864865
other_ty: other.ty,
865866
other_span: other.span,
866867
sub: sub_diag,
867-
})
868+
}))
868869
}
869870

870871
#[instrument(level = "debug", skip(tcx), ret)]
@@ -1471,15 +1472,16 @@ impl<'tcx> TyCtxt<'tcx> {
14711472
.filter(move |item| item.kind == AssocKind::Fn && item.defaultness(self).has_value())
14721473
}
14731474

1474-
pub fn repr_options_of_def(self, did: DefId) -> ReprOptions {
1475+
pub fn repr_options_of_def(self, did: LocalDefId) -> ReprOptions {
14751476
let mut flags = ReprFlags::empty();
14761477
let mut size = None;
14771478
let mut max_align: Option<Align> = None;
14781479
let mut min_pack: Option<Align> = None;
14791480

14801481
// Generate a deterministically-derived seed from the item's path hash
14811482
// to allow for cross-crate compilation to actually work
1482-
let mut field_shuffle_seed = self.def_path_hash(did).0.to_smaller_hash().as_u64();
1483+
let mut field_shuffle_seed =
1484+
self.def_path_hash(did.to_def_id()).0.to_smaller_hash().as_u64();
14831485

14841486
// If the user defined a custom seed for layout randomization, xor the item's
14851487
// path hash with the user defined seed, this will allowing determinism while

Diff for: ‎compiler/rustc_mir_build/src/build/matches/mod.rs

+20-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use rustc_data_structures::{
1616
};
1717
use rustc_index::bit_set::BitSet;
1818
use rustc_middle::middle::region;
19-
use rustc_middle::mir::*;
19+
use rustc_middle::mir::{self, *};
2020
use rustc_middle::thir::{self, *};
2121
use rustc_middle::ty::{self, CanonicalUserTypeAnnotation, Ty};
2222
use rustc_span::symbol::Symbol;
@@ -1052,18 +1052,31 @@ struct Ascription<'tcx> {
10521052
variance: ty::Variance,
10531053
}
10541054

1055+
#[derive(Debug, Clone)]
1056+
enum TestCase<'pat, 'tcx> {
1057+
Irrefutable { binding: Option<Binding<'tcx>>, ascription: Option<Ascription<'tcx>> },
1058+
Variant { adt_def: ty::AdtDef<'tcx>, variant_index: VariantIdx },
1059+
Constant { value: mir::Const<'tcx> },
1060+
Range(&'pat PatRange<'tcx>),
1061+
Slice { len: usize, variable_length: bool },
1062+
Or,
1063+
}
1064+
10551065
#[derive(Debug, Clone)]
10561066
pub(crate) struct MatchPair<'pat, 'tcx> {
1057-
// This place...
1067+
/// This place...
10581068
place: PlaceBuilder<'tcx>,
10591069

1060-
// ... must match this pattern.
1061-
// Invariant: after creation and simplification in `Candidate::new()`, all match pairs must be
1062-
// simplified, i.e. require a test.
1063-
pattern: &'pat Pat<'tcx>,
1070+
/// ... must pass this test...
1071+
// Invariant: after creation and simplification in `Candidate::new()`, this must not be
1072+
// `Irrefutable`.
1073+
test_case: TestCase<'pat, 'tcx>,
10641074

1065-
/// Precomputed sub-match pairs of `pattern`.
1075+
/// ... and these subpairs must match.
10661076
subpairs: Vec<Self>,
1077+
1078+
/// The pattern this was created from.
1079+
pattern: &'pat Pat<'tcx>,
10671080
}
10681081

10691082
/// See [`Test`] for more.

0 commit comments

Comments
 (0)