nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-13 07:24:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address nits

Browse Source
This commit is contained in:
Michael Goulet 2024-06-01 10:31:28 -04:00
parent f14b9651a1
commit 208c316a61
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_infer/src/infer/mod.rs
View File

@ -1269,16 +1269,16 @@ impl<'tcx> InferCtxt<'tcx> {
ty::IntVar(v) => {
match self.inner.borrow_mut().int_unification_table().probe_value(v) {
ty::IntVarValue::Unknown => ty,
ty::IntVarValue::IntType(ty) => Ty::new_int(self.tcx, ty),
ty::IntVarValue::UintType(ty) => Ty::new_uint(self.tcx, ty),
ty::IntVarValue::Unknown => ty,
}
}
ty::FloatVar(v) => {
match self.inner.borrow_mut().float_unification_table().probe_value(v) {
ty::FloatVarValue::Unknown => ty,
ty::FloatVarValue::Known(ty) => Ty::new_float(self.tcx, ty),
ty::FloatVarValue::Unknown => ty,
}
}
@ -1644,7 +1644,7 @@ impl<'tcx> InferCtxt<'tcx> {
// If `inlined_probe_value` returns a value it's always a
// `ty::Int(_)` or `ty::UInt(_)`, which never matches a
// `ty::Infer(_)`.
!self.inner.borrow_mut().int_unification_table().inlined_probe_value(v).is_unknown()
self.inner.borrow_mut().int_unification_table().inlined_probe_value(v).is_known()
}
TyOrConstInferVar::TyFloat(v) => {
@ -1652,7 +1652,7 @@ impl<'tcx> InferCtxt<'tcx> {
// `ty::Float(_)`, which never matches a `ty::Infer(_)`.
//
// Not `inlined_probe_value(v)` because this call site is colder.
!self.inner.borrow_mut().float_unification_table().probe_value(v).is_unknown()
self.inner.borrow_mut().float_unification_table().probe_value(v).is_known()
}
TyOrConstInferVar::Const(v) => {

22
compiler/rustc_type_ir/src/ty_kind.rs
View File

@ -723,8 +723,15 @@ pub enum IntVarValue {
}
impl IntVarValue {
pub fn is_unknown(&self) -> bool {
matches!(self, IntVarValue::Unknown)
pub fn is_known(self) -> bool {
match self {
IntVarValue::IntType(_) | IntVarValue::UintType(_) => true,
IntVarValue::Unknown => false,
}
}
pub fn is_unknown(self) -> bool {
!self.is_known()
}
}
@ -735,8 +742,15 @@ pub enum FloatVarValue {
}
impl FloatVarValue {
pub fn is_unknown(&self) -> bool {
matches!(self, FloatVarValue::Unknown)
pub fn is_known(self) -> bool {
match self {
FloatVarValue::Known(_) => true,
FloatVarValue::Unknown => false,
}
}
pub fn is_unknown(self) -> bool {
!self.is_known()
}
}