bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/consteval/tests.rs')
-rw-r--r--crates/hir-ty/src/consteval/tests.rs32
1 files changed, 18 insertions, 14 deletions
diff --git a/crates/hir-ty/src/consteval/tests.rs b/crates/hir-ty/src/consteval/tests.rs
index f1aa06d488..08f201fea9 100644
--- a/crates/hir-ty/src/consteval/tests.rs
+++ b/crates/hir-ty/src/consteval/tests.rs
@@ -27,7 +27,7 @@ use super::{
mod intrinsics;
-fn simplify(e: ConstEvalError<'_>) -> ConstEvalError<'_> {
+fn simplify(e: ConstEvalError) -> ConstEvalError {
match e {
ConstEvalError::MirEvalError(MirEvalError::InFunction(e, _)) => {
simplify(ConstEvalError::MirEvalError(*e))
@@ -39,7 +39,7 @@ fn simplify(e: ConstEvalError<'_>) -> ConstEvalError<'_> {
#[track_caller]
fn check_fail(
#[rust_analyzer::rust_fixture] ra_fixture: &str,
- error: impl FnOnce(ConstEvalError<'_>) -> bool,
+ error: impl FnOnce(ConstEvalError) -> bool,
) {
let (db, file_id) = TestDB::with_single_file(ra_fixture);
crate::attach_db(&db, || match eval_goal(&db, file_id) {
@@ -104,7 +104,7 @@ fn check_answer(
});
}
-fn pretty_print_err(e: ConstEvalError<'_>, db: &TestDB) -> String {
+fn pretty_print_err(e: ConstEvalError, db: &TestDB) -> String {
let mut err = String::new();
let span_formatter = |file, range| format!("{file:?} {range:?}");
let display_target =
@@ -121,12 +121,12 @@ fn pretty_print_err(e: ConstEvalError<'_>, db: &TestDB) -> String {
err
}
-fn eval_goal(db: &TestDB, file_id: EditionedFileId) -> Result<Const<'_>, ConstEvalError<'_>> {
+fn eval_goal(db: &TestDB, file_id: EditionedFileId) -> Result<Const<'_>, ConstEvalError> {
let _tracing = setup_tracing();
- let interner = DbInterner::new_with(db, None, None);
+ let interner = DbInterner::new_no_crate(db);
let module_id = db.module_for_file(file_id.file_id(db));
let def_map = module_id.def_map(db);
- let scope = &def_map[module_id.local_id].scope;
+ let scope = &def_map[module_id].scope;
let const_id = scope
.declarations()
.find_map(|x| match x {
@@ -142,7 +142,7 @@ fn eval_goal(db: &TestDB, file_id: EditionedFileId) -> Result<Const<'_>, ConstEv
_ => None,
})
.expect("No const named GOAL found in the test");
- db.const_eval(const_id.into(), GenericArgs::new_from_iter(interner, []), None)
+ db.const_eval(const_id, GenericArgs::empty(interner), None)
}
#[test]
@@ -851,6 +851,7 @@ fn ifs() {
fn loops() {
check_number(
r#"
+ //- minicore: add, builtin_impls
const GOAL: u8 = {
let mut x = 0;
loop {
@@ -871,6 +872,7 @@ fn loops() {
);
check_number(
r#"
+ //- minicore: add, builtin_impls
const GOAL: u8 = {
let mut x = 0;
loop {
@@ -885,6 +887,7 @@ fn loops() {
);
check_number(
r#"
+ //- minicore: add, builtin_impls
const GOAL: u8 = {
'a: loop {
let x = 'b: loop {
@@ -907,7 +910,7 @@ fn loops() {
);
check_number(
r#"
- //- minicore: add
+ //- minicore: add, builtin_impls
const GOAL: u8 = {
let mut x = 0;
'a: loop {
@@ -1277,7 +1280,7 @@ fn pattern_matching_ergonomics() {
fn destructing_assignment() {
check_number(
r#"
- //- minicore: add
+ //- minicore: add, builtin_impls
const fn f(i: &mut u8) -> &mut u8 {
*i += 1;
i
@@ -1469,11 +1472,11 @@ fn result_layout_niche_optimization() {
fn options() {
check_number(
r#"
- //- minicore: option
+ //- minicore: option, add, builtin_impls
const GOAL: u8 = {
let x = Some(2);
match x {
- Some(y) => 2 * y,
+ Some(y) => 2 + y,
_ => 10,
}
};
@@ -1482,7 +1485,7 @@ fn options() {
);
check_number(
r#"
- //- minicore: option
+ //- minicore: option, add, builtin_impls
fn f(x: Option<Option<i32>>) -> i32 {
if let Some(y) = x && let Some(z) = y {
z
@@ -1498,11 +1501,11 @@ fn options() {
);
check_number(
r#"
- //- minicore: option
+ //- minicore: option, add, builtin_impls
const GOAL: u8 = {
let x = None;
match x {
- Some(y) => 2 * y,
+ Some(y) => 2 + y,
_ => 10,
}
};
@@ -1565,6 +1568,7 @@ const GOAL: u8 = {
}
#[test]
+#[ignore = "builtin derive macros are currently not working with MIR eval"]
fn builtin_derive_macro() {
check_number(
r#"