rust-analyzer

Unnamed repository; edit this file 'description' to name the repository.

Clone

HTTPS

SSH

Diffstat (limited to 'crates/hir-ty/src/layout/tests.rs')

-rw-r--r--

1 files changed, 9 insertions, 3 deletions

diff --git a/crates/hir-ty/src/layout/tests.rs b/crates/hir-ty/src/layout/tests.rs
index ba3dfe8100..6c1eccb75e 100644
--- a/crates/hir-ty/src/layout/tests.rs
+++ b/crates/hir-ty/src/layout/tests.rs

@@ -1,6 +1,7 @@

use chalk_ir::{AdtId, TyKind};

use either::Either;

use hir_def::db::DefDatabase;

+use project_model::target_data_layout::RustcDataLayoutConfig;

use rustc_hash::FxHashMap;

use test_fixture::WithFixture;

use triomphe::Arc;

@@ -15,13 +16,18 @@ use crate::{

mod closure;

fn current_machine_data_layout() -> String {

- project_model::target_data_layout::get(None, None, &FxHashMap::default()).unwrap()

+ project_model::target_data_layout::get(

+ RustcDataLayoutConfig::Rustc(None),

+ None,

+ &FxHashMap::default(),

+ )

+ .unwrap()

}

fn eval_goal(ra_fixture: &str, minicore: &str) -> Result<Arc<Layout>, LayoutError> {

let target_data_layout = current_machine_data_layout();

let ra_fixture = format!(

- "{minicore}//- /main.rs crate:test target_data_layout:{target_data_layout}\n{ra_fixture}",

+ "//- target_data_layout: {target_data_layout}\n{minicore}//- /main.rs crate:test\n{ra_fixture}",

);

let (db, file_ids) = TestDB::with_many_files(&ra_fixture);

@@ -70,7 +76,7 @@ fn eval_goal(ra_fixture: &str, minicore: &str) -> Result<Arc<Layout>, LayoutErro

fn eval_expr(ra_fixture: &str, minicore: &str) -> Result<Arc<Layout>, LayoutError> {

let target_data_layout = current_machine_data_layout();

let ra_fixture = format!(

- "{minicore}//- /main.rs crate:test target_data_layout:{target_data_layout}\nfn main(){{let goal = {{{ra_fixture}}};}}",

+ "//- target_data_layout: {target_data_layout}\n{minicore}//- /main.rs crate:test\nfn main(){{let goal = {{{ra_fixture}}};}}",

);

let (db, file_id) = TestDB::with_single_file(&ra_fixture);