aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_ide/src
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-07-23 14:58:45 +0100
committerGitHub <[email protected]>2020-07-23 14:58:45 +0100
commit7bada8a76dd6438cb6549d735d06e60fc50f6388 (patch)
tree31e30e51dc863c01a3e1befa43ef58c6089c41dd /crates/ra_ide/src
parent83f364523f6874e52ed8db50be00fd28bdb57b94 (diff)
parentb68ef1231daf6eb1abeb06a30dc89af1254b833d (diff)
Merge #5473
5473: Changes to rust-project.json r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide/src')
-rw-r--r--crates/ra_ide/src/mock_analysis.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_ide/src/mock_analysis.rs b/crates/ra_ide/src/mock_analysis.rs
index b28054688..c7e0f4b58 100644
--- a/crates/ra_ide/src/mock_analysis.rs
+++ b/crates/ra_ide/src/mock_analysis.rs
@@ -2,7 +2,7 @@
2use std::sync::Arc; 2use std::sync::Arc;
3 3
4use ra_cfg::CfgOptions; 4use ra_cfg::CfgOptions;
5use ra_db::{CrateName, Env, FileSet, SourceRoot, VfsPath}; 5use ra_db::{CrateName, FileSet, SourceRoot, VfsPath};
6use test_utils::{ 6use test_utils::{
7 extract_annotations, extract_range_or_offset, Fixture, RangeOrOffset, CURSOR_MARKER, 7 extract_annotations, extract_range_or_offset, Fixture, RangeOrOffset, CURSOR_MARKER,
8}; 8};
@@ -110,7 +110,7 @@ impl MockAnalysis {
110 data.edition.and_then(|it| it.parse().ok()).unwrap_or(Edition::Edition2018); 110 data.edition.and_then(|it| it.parse().ok()).unwrap_or(Edition::Edition2018);
111 111
112 let file_id = FileId(i as u32 + 1); 112 let file_id = FileId(i as u32 + 1);
113 let env = Env::from(data.env.iter()); 113 let env = data.env.into_iter().collect();
114 if path == "/lib.rs" || path == "/main.rs" { 114 if path == "/lib.rs" || path == "/main.rs" {
115 root_crate = Some(crate_graph.add_crate_root( 115 root_crate = Some(crate_graph.add_crate_root(
116 file_id, 116 file_id,