Int constants must be valtrees in pattern lowering

oli-obk · oli-obk · commit bd6a96f04ec6 · 2024-03-27T14:28:50.000Z
diff --git a/compiler/rustc_middle/src/thir.rs b/compiler/rustc_middle/src/thir.rs
@@ -1018,11 +1018,7 @@ impl<'tcx> PatRangeBoundary<'tcx> {
             (Finite(mir::Const::Ty(a)), Finite(mir::Const::Ty(b)))
                 if matches!(ty.kind(), ty::Uint(_) | ty::Char) =>
             {
-                if let Some(a) = a.try_to_valtree() {
-                    if let Some(b) = b.try_to_valtree() {
-                        return Some(a.cmp(&b));
-                    }
-                }
+                return Some(a.to_valtree().cmp(&b.to_valtree()));
             }
             (
                 Finite(mir::Const::Val(mir::ConstValue::Scalar(Scalar::Int(a)), _)),

Original file line number	Diff line number	Diff line change
`@@ -1018,11 +1018,7 @@ impl<'tcx> PatRangeBoundary<'tcx> {`
`1018`	`1018`	`(Finite(mir::Const::Ty(a)), Finite(mir::Const::Ty(b)))`
`1019`	`1019`	`if matches!(ty.kind(), ty::Uint(_) \| ty::Char) =>`
`1020`	`1020`	`{`
`1021`		`- if let Some(a) = a.try_to_valtree() {`
`1022`		`- if let Some(b) = b.try_to_valtree() {`
`1023`		`- return Some(a.cmp(&b));`
`1024`		`- }`
`1025`		`- }`
	`1021`	`+ return Some(a.to_valtree().cmp(&b.to_valtree()));`
`1026`	`1022`	`}`
`1027`	`1023`	`(`
`1028`	`1024`	`Finite(mir::Const::Val(mir::ConstValue::Scalar(Scalar::Int(a)), _)),`