mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #123689 - spastorino:pattern_types_const_generics, r=oli-obk

Browse Source 
Add const generics support for pattern types

r? `@oli-obk`
This commit is contained in:
Guillaume Gomez 2024-04-10 16:15:24 +02:00 committed by GitHub
commit 3f7ae6803b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs
View File

@ -2223,6 +2223,24 @@ fn lower_ty_common(&self, hir_ty: &hir::Ty<'tcx>, borrowed: bool, in_path: bool)
Err(LitToConstError::TypeError) => todo!(),
}
}
hir::ExprKind::Path(hir::QPath::Resolved(
_,
&hir::Path {
res: Res::Def(DefKind::ConstParam, def_id), ..
},
)) => {
let ty = tcx
.type_of(def_id)
.no_bound_vars()
.expect("const parameter types cannot be generic");
let item_def_id = tcx.parent(def_id);
let generics = tcx.generics_of(item_def_id);
let index = generics.param_def_id_to_index[&def_id];
let name = tcx.item_name(def_id);
ty::Const::new_param(tcx, ty::ParamConst::new(index, name), ty)
}
_ => {
let err = tcx
.dcx()

8
compiler/rustc_ty_utils/src/layout.rs
View File

@ -133,10 +133,14 @@ fn layout_of_uncached<'tcx>(
ty::PatternKind::Range { start, end, include_end } => {
if let Abi::Scalar(scalar) | Abi::ScalarPair(scalar, _) = &mut layout.abi {
if let Some(start) = start {
scalar.valid_range_mut().start = start.eval_bits(tcx, param_env);
scalar.valid_range_mut().start = start
.try_eval_bits(tcx, param_env)
.ok_or_else(|| error(cx, LayoutError::Unknown(ty)))?;
}
if let Some(end) = end {
let mut end = end.eval_bits(tcx, param_env);
let mut end = end
.try_eval_bits(tcx, param_env)
.ok_or_else(|| error(cx, LayoutError::Unknown(ty)))?;
if !include_end {
end = end.wrapping_sub(1);
}

13
tests/ui/type/pattern_types/const_generics.rs Normal file
View File

@ -0,0 +1,13 @@
//@ check-pass
#![feature(pattern_types)]
#![feature(core_pattern_types)]
#![feature(core_pattern_type)]
use std::pat::pattern_type;
trait Foo {}
impl<const START: u32, const END: u32> Foo for pattern_type!(u32 is START..=END) {}
fn main() {}