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

Revert #14285

fix #14305
This commit is contained in:
bors 2023-03-10 08:34:27 +00:00
commit 1b5bba4535
3 changed files with 14 additions and 2 deletions

View File

@ -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,
}
}

View File

@ -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;
"#,
);
}

View File

@ -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<_>
}
"#,
);