Auto merge of rust-lang#14312 - HKalbasi:master, r=lnicola

Revert rust-lang#14285 fix rust-lang#14305
lnicola · Mar 10, 2023 · 1b5bba4 · 1b5bba4
2 parents 552aea5 + 71e1c02
commit 1b5bba4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/crates/hir-ty/src/consteval.rs b/crates/hir-ty/src/consteval.rs
@@ -100,7 +100,6 @@ pub(crate) fn path_to_const(
             };
             Some(ConstData { ty, value }.intern(Interner))
         }
-        Some(ValueNs::ConstId(c)) => db.const_eval(c).ok(),
         _ => None,
     }
 }

diff --git a/crates/hir-ty/src/tests/regression.rs b/crates/hir-ty/src/tests/regression.rs
@@ -1744,3 +1744,15 @@ fn foo(b: Bar) {
 "#,
     );
 }
+
+#[test]
+fn regression_14305() {
+    check_no_mismatches(
+        r#"
+//- minicore: add
+trait Tr {}
+impl Tr for [u8; C] {}
+const C: usize = 2 + 2;
+"#,
+    );
+}
diff --git a/crates/hir-ty/src/tests/simple.rs b/crates/hir-ty/src/tests/simple.rs
@@ -3277,13 +3277,14 @@ fn func() {
 
 #[test]
 fn issue_14275() {
+    // FIXME: evaluate const generic
     check_types(
         r#"
 struct Foo<const T: bool>;
 fn main() {
     const B: bool = false;
     let foo = Foo::<B>;
-      //^^^ Foo<false>
+      //^^^ Foo<_>
 }
 "#,
     );