language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: address suggestions

Browse source
This commit is contained in:
Artur Sinila 2022-07-17 18:22:11 +03:00
parent 15f73008f8
commit 83177a7cfe
No known key found for this signature in database
GPG key ID: 770E69D690735C61
12 changed files with 72 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/hir-ty/src/consteval.rs
View file

@ -395,22 +395,14 @@ pub fn unknown_const_as_generic(ty: Ty) -> GenericArg {
}
/// Interns a constant scalar with the given type
pub fn intern_const_scalar_with_type(value: ConstScalar, ty: Ty) -> Const {
pub fn intern_const_scalar(value: ConstScalar, ty: Ty) -> Const {
ConstData { ty, value: ConstValue::Concrete(chalk_ir::ConcreteConst { interned: value }) }
.intern(Interner)
}
/// Interns a possibly-unknown target usize
pub fn usize_const(value: Option<u128>) -> Const {
intern_const_scalar_with_type(
value.map(ConstScalar::UInt).unwrap_or(ConstScalar::Unknown),
TyBuilder::usize(),
)
}
/// Interns a constant scalar with the default type
pub fn intern_const_scalar(value: ConstScalar) -> Const {
intern_const_scalar_with_type(value, TyBuilder::builtin(value.builtin_type()))
intern_const_scalar(value.map_or(ConstScalar::Unknown, ConstScalar::UInt), TyBuilder::usize())
}
pub(crate) fn const_eval_recover(
@ -470,7 +462,7 @@ pub(crate) fn eval_to_const<'a>(
Ok(ComputedExpr::Literal(literal)) => literal.into(),
_ => ConstScalar::Unknown,
};
intern_const_scalar_with_type(const_scalar, TyBuilder::usize())
intern_const_scalar(const_scalar, TyBuilder::usize())
}
#[cfg(test)]