From 3a9934e2c3280864877a90c5ced777bad898d73a Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sun, 10 Feb 2019 22:34:29 +0100 Subject: Keep track of crate edition --- crates/ra_ide_api/src/lib.rs | 3 ++- crates/ra_ide_api/src/mock_analysis.rs | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'crates/ra_ide_api/src') diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs index de3ec4e0a..d77a56ce8 100644 --- a/crates/ra_ide_api/src/lib.rs +++ b/crates/ra_ide_api/src/lib.rs @@ -62,7 +62,8 @@ pub use ra_ide_api_light::{ LineIndex, LineCol, translate_offset_with_edit, }; pub use ra_db::{ - Canceled, CrateGraph, CrateId, FileId, FilePosition, FileRange, SourceRootId + Canceled, CrateGraph, CrateId, FileId, FilePosition, FileRange, SourceRootId, + Edition }; pub use hir::Documentation; diff --git a/crates/ra_ide_api/src/mock_analysis.rs b/crates/ra_ide_api/src/mock_analysis.rs index 017ac5de3..550d69641 100644 --- a/crates/ra_ide_api/src/mock_analysis.rs +++ b/crates/ra_ide_api/src/mock_analysis.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use relative_path::RelativePathBuf; use test_utils::{extract_offset, extract_range, parse_fixture, CURSOR_MARKER}; -use crate::{Analysis, AnalysisChange, AnalysisHost, CrateGraph, FileId, FilePosition, FileRange, SourceRootId}; +use crate::{Analysis, AnalysisChange, AnalysisHost, CrateGraph, FileId, FilePosition, FileRange, SourceRootId, Edition::Edition2018}; /// Mock analysis is used in test to bootstrap an AnalysisHost/Analysis /// from a set of in-memory files. @@ -89,9 +89,9 @@ impl MockAnalysis { let path = RelativePathBuf::from_path(&path[1..]).unwrap(); let file_id = FileId(i as u32 + 1); if path == "/lib.rs" || path == "/main.rs" { - root_crate = Some(crate_graph.add_crate_root(file_id)); + root_crate = Some(crate_graph.add_crate_root(file_id, Edition2018)); } else if path.ends_with("/lib.rs") { - let other_crate = crate_graph.add_crate_root(file_id); + let other_crate = crate_graph.add_crate_root(file_id, Edition2018); let crate_name = path.parent().unwrap().file_name().unwrap(); if let Some(root_crate) = root_crate { crate_graph.add_dep(root_crate, crate_name.into(), other_crate).unwrap(); -- cgit v1.2.3