nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-11 08:05:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

address review by @eddyb

Browse Source
This commit is contained in:
Jade 2021-05-11 15:18:45 -07:00
parent dc63fea427
commit f28c053c67
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/hir_ty/src/consts.rs
View File

@ -4,7 +4,8 @@
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub enum ConstScalar { pub enum ConstScalar {
// for now, we only support the trivial case of constant evaluating the length of an array // for now, we only support the trivial case of constant evaluating the length of an array
Usize(usize), // Note that this is u64 because the target usize may be bigger than our usize
Usize(u64),
/// Case of an unknown value that rustc might know but we don't /// Case of an unknown value that rustc might know but we don't
Unknown, Unknown,

2
crates/hir_ty/src/infer/expr.rs
View File

@ -746,7 +746,7 @@ impl<'a> InferenceContext<'a> {
ty: TyKind::Scalar(Scalar::Uint(UintTy::Usize)).intern(&Interner), ty: TyKind::Scalar(Scalar::Uint(UintTy::Usize)).intern(&Interner),
value: ConstValue::Concrete(chalk_ir::ConcreteConst { value: ConstValue::Concrete(chalk_ir::ConcreteConst {
interned: len interned: len
.map(|len| ConstScalar::Usize(len)) .map(|len| ConstScalar::Usize(len as u64))
.unwrap_or(ConstScalar::Unknown), .unwrap_or(ConstScalar::Unknown),
}), }),
}; };