Skip to content

Commit 4952865

Browse files
oli-obkoli-obk
committed
Remove the Option part of range ends in the HIR
1 parent 31dd548 commit 4952865

File tree

32 files changed

+385
-264
lines changed

32 files changed

+385
-264
lines changed

‎compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ struct LoweringContext<'a, 'hir> {
135135

136136
allow_try_trait: Arc<[Symbol]>,
137137
allow_gen_future: Arc<[Symbol]>,
138+
allow_pattern_type: Arc<[Symbol]>,
138139
allow_async_iterator: Arc<[Symbol]>,
139140
allow_for_await: Arc<[Symbol]>,
140141
allow_async_fn_traits: Arc<[Symbol]>,
@@ -172,6 +173,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
172173
impl_trait_defs: Vec::new(),
173174
impl_trait_bounds: Vec::new(),
174175
allow_try_trait: [sym::try_trait_v2, sym::yeet_desugar_details].into(),
176+
allow_pattern_type: [sym::pattern_types, sym::pattern_type_range_trait].into(),
175177
allow_gen_future: if tcx.features().async_fn_track_caller() {
176178
[sym::gen_future, sym::closure_track_caller].into()
177179
} else {
@@ -1387,7 +1389,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
13871389
}
13881390
}
13891391
TyKind::Pat(ty, pat) => {
1390-
hir::TyKind::Pat(self.lower_ty(ty, itctx), self.lower_ty_pat(pat))
1392+
hir::TyKind::Pat(self.lower_ty(ty, itctx), self.lower_ty_pat(pat, ty.span))
13911393
}
13921394
TyKind::MacCall(_) => {
13931395
span_bug!(t.span, "`TyKind::MacCall` should have been expanded by now")

‎compiler/rustc_ast_lowering/src/pat.rs

Lines changed: 107 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ use std::sync::Arc;
33
use rustc_ast::ptr::P;
44
use rustc_ast::*;
55
use rustc_data_structures::stack::ensure_sufficient_stack;
6-
use rustc_hir as hir;
7-
use rustc_hir::def::Res;
6+
use rustc_hir::def::{DefKind, Res};
7+
use rustc_hir::{self as hir, LangItem};
88
use rustc_middle::span_bug;
99
use rustc_span::source_map::{Spanned, respan};
10-
use rustc_span::{Ident, Span};
10+
use rustc_span::{DesugaringKind, Ident, Span, kw};
1111

1212
use super::errors::{
1313
ArbitraryExpressionInPattern, ExtraDoubleDot, MisplacedDoubleDot, SubTupleBinding,
@@ -430,22 +430,119 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
430430
self.arena.alloc(hir::PatExpr { hir_id: self.lower_node_id(expr.id), span, kind })
431431
}
432432

433-
pub(crate) fn lower_ty_pat(&mut self, pattern: &TyPat) -> &'hir hir::TyPat<'hir> {
434-
self.arena.alloc(self.lower_ty_pat_mut(pattern))
433+
pub(crate) fn lower_ty_pat(
434+
&mut self,
435+
pattern: &TyPat,
436+
base_type: Span,
437+
) -> &'hir hir::TyPat<'hir> {
438+
self.arena.alloc(self.lower_ty_pat_mut(pattern, base_type))
435439
}
436440

437-
fn lower_ty_pat_mut(&mut self, pattern: &TyPat) -> hir::TyPat<'hir> {
441+
fn lower_ty_pat_mut(&mut self, pattern: &TyPat, base_type: Span) -> hir::TyPat<'hir> {
438442
// loop here to avoid recursion
439443
let pat_hir_id = self.lower_node_id(pattern.id);
440444
let node = match &pattern.kind {
441-
TyPatKind::Range(e1, e2, Spanned { node: end, .. }) => hir::TyPatKind::Range(
442-
e1.as_deref().map(|e| self.lower_anon_const_to_const_arg(e)),
443-
e2.as_deref().map(|e| self.lower_anon_const_to_const_arg(e)),
444-
self.lower_range_end(end, e2.is_some()),
445+
TyPatKind::Range(e1, e2, Spanned { node: end, span }) => hir::TyPatKind::Range(
446+
e1.as_deref().map(|e| self.lower_anon_const_to_const_arg(e)).unwrap_or_else(|| {
447+
self.lower_ty_pat_range_end(
448+
hir::LangItem::RangeMin,
449+
span.shrink_to_lo(),
450+
base_type,
451+
)
452+
}),
453+
e2.as_deref()
454+
.map(|e| match end {
455+
RangeEnd::Included(..) => self.lower_anon_const_to_const_arg(e),
456+
RangeEnd::Excluded => self.lower_excluded_range_end(e),
457+
})
458+
.unwrap_or_else(|| {
459+
self.lower_ty_pat_range_end(
460+
hir::LangItem::RangeMax,
461+
span.shrink_to_hi(),
462+
base_type,
463+
)
464+
}),
445465
),
446466
TyPatKind::Err(guar) => hir::TyPatKind::Err(*guar),
447467
};
448468

449469
hir::TyPat { hir_id: pat_hir_id, kind: node, span: self.lower_span(pattern.span) }
450470
}
471+
472+
fn lower_excluded_range_end(&mut self, e: &AnonConst) -> &'hir hir::ConstArg<'hir> {
473+
let span = self.lower_span(e.value.span);
474+
let unstable_span = self.mark_span_with_reason(
475+
DesugaringKind::PatTyRange,
476+
span,
477+
Some(Arc::clone(&self.allow_pattern_type)),
478+
);
479+
let anon_const = self.with_new_scopes(span, |this| {
480+
let def_id = this.local_def_id(e.id);
481+
let hir_id = this.lower_node_id(e.id);
482+
let body = this.lower_body(|this| {
483+
// Need to use a custom function as we can't just subtract `1` from a `char`.
484+
let kind = hir::ExprKind::Path(this.make_lang_item_qpath(
485+
hir::LangItem::RangeSub,
486+
unstable_span,
487+
None,
488+
));
489+
let fn_def = this.arena.alloc(hir::Expr { hir_id: this.next_id(), kind, span });
490+
let args = this.arena.alloc([this.lower_expr_mut(&e.value)]);
491+
(
492+
&[],
493+
hir::Expr {
494+
hir_id: this.next_id(),
495+
kind: hir::ExprKind::Call(fn_def, args),
496+
span,
497+
},
498+
)
499+
});
500+
hir::AnonConst { def_id, hir_id, body, span }
501+
});
502+
self.arena.alloc(hir::ConstArg {
503+
hir_id: self.next_id(),
504+
kind: hir::ConstArgKind::Anon(self.arena.alloc(anon_const)),
505+
})
506+
}
507+
508+
fn lower_ty_pat_range_end(
509+
&mut self,
510+
lang_item: LangItem,
511+
span: Span,
512+
base_type: Span,
513+
) -> &'hir hir::ConstArg<'hir> {
514+
let parent_def_id = self.current_hir_id_owner.def_id;
515+
let node_id = self.next_node_id();
516+
517+
// Add a definition for the in-band const def.
518+
// We're lowering a const argument that was originally thought to be a type argument,
519+
// so the def collector didn't create the def ahead of time. That's why we have to do
520+
// it here.
521+
let def_id = self.create_def(parent_def_id, node_id, kw::Empty, DefKind::AnonConst, span);
522+
let hir_id = self.lower_node_id(node_id);
523+
524+
let unstable_span = self.mark_span_with_reason(
525+
DesugaringKind::PatTyRange,
526+
self.lower_span(span),
527+
Some(Arc::clone(&self.allow_pattern_type)),
528+
);
529+
let span = self.lower_span(base_type);
530+
531+
let path_expr = hir::Expr {
532+
hir_id: self.next_id(),
533+
kind: hir::ExprKind::Path(self.make_lang_item_qpath(lang_item, unstable_span, None)),
534+
span,
535+
};
536+
537+
let ct = self.with_new_scopes(span, |this| {
538+
self.arena.alloc(hir::AnonConst {
539+
def_id,
540+
hir_id,
541+
body: this.lower_body(|_this| (&[], path_expr)),
542+
span,
543+
})
544+
});
545+
let hir_id = self.next_id();
546+
self.arena.alloc(hir::ConstArg { kind: hir::ConstArgKind::Anon(ct), hir_id })
547+
}
451548
}

‎compiler/rustc_hir/src/hir.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1584,7 +1584,7 @@ pub enum PatExprKind<'hir> {
15841584
#[derive(Debug, Clone, Copy, HashStable_Generic)]
15851585
pub enum TyPatKind<'hir> {
15861586
/// A range pattern (e.g., `1..=2` or `1..2`).
1587-
Range(Option<&'hir ConstArg<'hir>>, Option<&'hir ConstArg<'hir>>, RangeEnd),
1587+
Range(&'hir ConstArg<'hir>, &'hir ConstArg<'hir>),
15881588

15891589
/// A placeholder for a pattern that wasn't well formed in some way.
15901590
Err(ErrorGuaranteed),

‎compiler/rustc_hir/src/intravisit.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -706,9 +706,9 @@ pub fn walk_arm<'v, V: Visitor<'v>>(visitor: &mut V, arm: &'v Arm<'v>) -> V::Res
706706
pub fn walk_ty_pat<'v, V: Visitor<'v>>(visitor: &mut V, pattern: &'v TyPat<'v>) -> V::Result {
707707
try_visit!(visitor.visit_id(pattern.hir_id));
708708
match pattern.kind {
709-
TyPatKind::Range(lower_bound, upper_bound, _) => {
710-
visit_opt!(visitor, visit_const_arg_unambig, lower_bound);
711-
visit_opt!(visitor, visit_const_arg_unambig, upper_bound);
709+
TyPatKind::Range(lower_bound, upper_bound) => {
710+
try_visit!(visitor.visit_const_arg_unambig(lower_bound));
711+
try_visit!(visitor.visit_const_arg_unambig(upper_bound));
712712
}
713713
TyPatKind::Err(_) => (),
714714
}

‎compiler/rustc_hir/src/lang_items.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,9 @@ language_item_table! {
417417
Range, sym::Range, range_struct, Target::Struct, GenericRequirement::None;
418418
RangeToInclusive, sym::RangeToInclusive, range_to_inclusive_struct, Target::Struct, GenericRequirement::None;
419419
RangeTo, sym::RangeTo, range_to_struct, Target::Struct, GenericRequirement::None;
420+
RangeMax, sym::RangeMax, range_max, Target::AssocConst, GenericRequirement::Exact(0);
421+
RangeMin, sym::RangeMin, range_min, Target::AssocConst, GenericRequirement::Exact(0);
422+
RangeSub, sym::RangeSub, range_sub, Target::Method(MethodKind::Trait { body: false }), GenericRequirement::Exact(0);
420423

421424
// `new_range` types that are `Copy + IntoIterator`
422425
RangeFromCopy, sym::RangeFromCopy, range_from_copy_struct, Target::Struct, GenericRequirement::None;

‎compiler/rustc_hir_analysis/messages.ftl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,6 @@ hir_analysis_inherent_ty_outside_relevant = cannot define inherent `impl` for a
244244
.help = consider moving this inherent impl into the crate defining the type if possible
245245
.span_help = alternatively add `#[rustc_allow_incoherent_impl]` to the relevant impl items
246246
247-
hir_analysis_invalid_base_type = `{$ty}` is not a valid base type for range patterns
248-
.note = range patterns only support integers
249-
250247
hir_analysis_invalid_generic_receiver_ty = invalid generic `self` parameter type: `{$receiver_ty}`
251248
.note = type of `self` must not be a method generic parameter type
252249

‎compiler/rustc_hir_analysis/src/errors.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ use rustc_middle::ty::Ty;
99
use rustc_span::{Ident, Span, Symbol};
1010

1111
use crate::fluent_generated as fluent;
12-
mod pattern_types;
13-
pub(crate) use pattern_types::*;
1412
pub(crate) mod wrong_number_of_generic_args;
1513

1614
mod precise_captures;

‎compiler/rustc_hir_analysis/src/errors/pattern_types.rs

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

Lines changed: 10 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ pub mod generics;
2121
mod lint;
2222

2323
use std::assert_matches::assert_matches;
24-
use std::{char, slice};
24+
use std::slice;
2525

26-
use rustc_abi::Size;
2726
use rustc_ast::TraitObjectSyntax;
2827
use rustc_data_structures::fx::{FxHashSet, FxIndexMap, FxIndexSet};
2928
use rustc_errors::codes::*;
@@ -32,7 +31,7 @@ use rustc_errors::{
3231
};
3332
use rustc_hir::def::{CtorKind, CtorOf, DefKind, Namespace, Res};
3433
use rustc_hir::def_id::{DefId, LocalDefId};
35-
use rustc_hir::{self as hir, AnonConst, ConstArg, GenericArg, GenericArgs, HirId};
34+
use rustc_hir::{self as hir, AnonConst, GenericArg, GenericArgs, HirId};
3635
use rustc_infer::infer::{InferCtxt, TyCtxtInferExt};
3736
use rustc_infer::traits::ObligationCause;
3837
use rustc_middle::middle::stability::AllowUnstable;
@@ -54,7 +53,7 @@ use tracing::{debug, instrument};
5453

5554
use crate::bounds::Bounds;
5655
use crate::check::check_abi_fn_ptr;
57-
use crate::errors::{AmbiguousLifetimeBound, BadReturnTypeNotation, InvalidBaseType};
56+
use crate::errors::{AmbiguousLifetimeBound, BadReturnTypeNotation};
5857
use crate::hir_ty_lowering::errors::{GenericsArgsErrExtend, prohibit_assoc_item_constraint};
5958
use crate::hir_ty_lowering::generics::{check_generic_arg_count, lower_generic_args};
6059
use crate::middle::resolve_bound_vars as rbv;
@@ -2443,25 +2442,24 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
24432442
let ty_span = ty.span;
24442443
let ty = self.lower_ty(ty);
24452444
let pat_ty = match pat.kind {
2446-
hir::TyPatKind::Range(start, end, include_end) => {
2445+
hir::TyPatKind::Range(start, end) => {
24472446
let (ty, start, end) = match ty.kind() {
24482447
ty::Int(_) | ty::Uint(_) | ty::Char => {
2449-
let (start, end) = self.lower_ty_pat_range(ty, start, end);
2448+
let start = self.lower_const_arg(start, FeedConstTy::No);
2449+
let end = self.lower_const_arg(end, FeedConstTy::No);
24502450
(ty, start, end)
24512451
}
24522452
_ => {
2453-
let guar = self.dcx().emit_err(InvalidBaseType {
2454-
ty,
2455-
pat: "range",
2453+
let guar = self.dcx().span_delayed_bug(
24562454
ty_span,
2457-
pat_span: pat.span,
2458-
});
2455+
"invalid base type for range pattern",
2456+
);
24592457
let errc = ty::Const::new_error(tcx, guar);
24602458
(Ty::new_error(tcx, guar), errc, errc)
24612459
}
24622460
};
24632461

2464-
let pat = tcx.mk_pat(ty::PatternKind::Range { start, end, include_end });
2462+
let pat = tcx.mk_pat(ty::PatternKind::Range { start, end });
24652463
Ty::new_pat(tcx, ty, pat)
24662464
}
24672465
hir::TyPatKind::Err(e) => Ty::new_error(tcx, e),
@@ -2476,70 +2474,6 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
24762474
result_ty
24772475
}
24782476

2479-
fn lower_ty_pat_range(
2480-
&self,
2481-
base: Ty<'tcx>,
2482-
start: Option<&ConstArg<'tcx>>,
2483-
end: Option<&ConstArg<'tcx>>,
2484-
) -> (ty::Const<'tcx>, ty::Const<'tcx>) {
2485-
let tcx = self.tcx();
2486-
let size = match base.kind() {
2487-
ty::Int(i) => {
2488-
i.bit_width().map_or(tcx.data_layout.pointer_size, |bits| Size::from_bits(bits))
2489-
}
2490-
ty::Uint(ui) => {
2491-
ui.bit_width().map_or(tcx.data_layout.pointer_size, |bits| Size::from_bits(bits))
2492-
}
2493-
ty::Char => Size::from_bytes(4),
2494-
_ => unreachable!(),
2495-
};
2496-
let start =
2497-
start.map(|expr| self.lower_const_arg(expr, FeedConstTy::No)).unwrap_or_else(|| {
2498-
match base.kind() {
2499-
ty::Char | ty::Uint(_) => ty::Const::new_value(
2500-
tcx,
2501-
ty::ValTree::from_scalar_int(ty::ScalarInt::null(size)),
2502-
base,
2503-
),
2504-
ty::Int(_) => ty::Const::new_value(
2505-
tcx,
2506-
ty::ValTree::from_scalar_int(
2507-
ty::ScalarInt::truncate_from_int(size.signed_int_min(), size).0,
2508-
),
2509-
base,
2510-
),
2511-
_ => unreachable!(),
2512-
}
2513-
});
2514-
let end = end.map(|expr| self.lower_const_arg(expr, FeedConstTy::No)).unwrap_or_else(
2515-
|| match base.kind() {
2516-
ty::Char => ty::Const::new_value(
2517-
tcx,
2518-
ty::ValTree::from_scalar_int(
2519-
ty::ScalarInt::truncate_from_uint(char::MAX, size).0,
2520-
),
2521-
base,
2522-
),
2523-
ty::Uint(_) => ty::Const::new_value(
2524-
tcx,
2525-
ty::ValTree::from_scalar_int(
2526-
ty::ScalarInt::truncate_from_uint(size.unsigned_int_max(), size).0,
2527-
),
2528-
base,
2529-
),
2530-
ty::Int(_) => ty::Const::new_value(
2531-
tcx,
2532-
ty::ValTree::from_scalar_int(
2533-
ty::ScalarInt::truncate_from_int(size.signed_int_max(), size).0,
2534-
),
2535-
base,
2536-
),
2537-
_ => unreachable!(),
2538-
},
2539-
);
2540-
(start, end)
2541-
}
2542-
25432477
/// Lower an opaque type (i.e., an existential impl-Trait type) from the HIR.
25442478
#[instrument(level = "debug", skip(self), ret)]
25452479
fn lower_opaque_ty(&self, def_id: LocalDefId, in_trait: bool) -> Ty<'tcx> {

‎compiler/rustc_hir_analysis/src/variance/constraints.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ impl<'a, 'tcx> ConstraintContext<'a, 'tcx> {
252252

253253
ty::Pat(typ, pat) => {
254254
match *pat {
255-
ty::PatternKind::Range { start, end, include_end: _ } => {
255+
ty::PatternKind::Range { start, end } => {
256256
self.add_constraints_from_const(current, start, variance);
257257
self.add_constraints_from_const(current, end, variance);
258258
}

‎compiler/rustc_hir_pretty/src/lib.rs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1884,17 +1884,10 @@ impl<'a> State<'a> {
18841884
// Pat isn't normalized, but the beauty of it
18851885
// is that it doesn't matter
18861886
match pat.kind {
1887-
TyPatKind::Range(begin, end, end_kind) => {
1888-
if let Some(expr) = begin {
1889-
self.print_const_arg(expr);
1890-
}
1891-
match end_kind {
1892-
RangeEnd::Included => self.word("..."),
1893-
RangeEnd::Excluded => self.word(".."),
1894-
}
1895-
if let Some(expr) = end {
1896-
self.print_const_arg(expr);
1897-
}
1887+
TyPatKind::Range(begin, end) => {
1888+
self.print_const_arg(begin);
1889+
self.word("..=");
1890+
self.print_const_arg(end);
18981891
}
18991892
TyPatKind::Err(_) => {
19001893
self.popen();

0 commit comments

Comments
 (0)