From 6996ec860bde7e6186ba8609b68ef51b8713e2ea Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 23 Jun 2020 18:17:43 +0200 Subject: Drop rarely used fixture functionality --- crates/ra_db/src/fixture.rs | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'crates/ra_db/src/fixture.rs') diff --git a/crates/ra_db/src/fixture.rs b/crates/ra_db/src/fixture.rs index f7d9118a9..bf897baff 100644 --- a/crates/ra_db/src/fixture.rs +++ b/crates/ra_db/src/fixture.rs @@ -114,7 +114,6 @@ fn with_single_file(db: &mut dyn SourceDatabaseExt, ra_fixture: &str) -> FileId let crate_graph = if let Some(entry) = fixture { let meta = match ParsedMeta::from(&entry.meta) { ParsedMeta::File(it) => it, - _ => panic!("with_single_file only support file meta"), }; let mut crate_graph = CrateGraph::default(); @@ -159,21 +158,14 @@ fn with_files(db: &mut dyn SourceDatabaseExt, fixture: &str) -> Option = None; let mut file_set = FileSet::default(); - let mut source_root_id = WORKSPACE; - let mut source_root_prefix = "/".to_string(); + let source_root_id = WORKSPACE; + let source_root_prefix = "/".to_string(); let mut file_id = FileId(0); let mut file_position = None; for entry in fixture.iter() { let meta = match ParsedMeta::from(&entry.meta) { - ParsedMeta::Root { path } => { - let file_set = std::mem::replace(&mut file_set, FileSet::default()); - db.set_source_root(source_root_id, Arc::new(SourceRoot::new_local(file_set))); - source_root_id.0 += 1; - source_root_prefix = path; - continue; - } ParsedMeta::File(it) => it, }; assert!(meta.path.starts_with(&source_root_prefix)); @@ -239,7 +231,6 @@ fn with_files(db: &mut dyn SourceDatabaseExt, fixture: &str) -> Option for ParsedMeta { fn from(meta: &FixtureMeta) -> Self { match meta { - FixtureMeta::Root { path } => { - // `Self::Root` causes a false warning: 'variant is never constructed: `Root` ' - // see https://github.com/rust-lang/rust/issues/69018 - ParsedMeta::Root { path: path.to_owned() } - } FixtureMeta::File(f) => Self::File(FileMeta { path: f.path.to_owned(), krate: f.crate_name.to_owned(), -- cgit v1.2.3 From 30748161f0b4699ba9bc699a38ac9fc2fae49461 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 23 Jun 2020 18:20:32 +0200 Subject: Simplify --- crates/ra_db/src/fixture.rs | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'crates/ra_db/src/fixture.rs') diff --git a/crates/ra_db/src/fixture.rs b/crates/ra_db/src/fixture.rs index bf897baff..7f006487a 100644 --- a/crates/ra_db/src/fixture.rs +++ b/crates/ra_db/src/fixture.rs @@ -61,7 +61,7 @@ use std::{str::FromStr, sync::Arc}; use ra_cfg::CfgOptions; use rustc_hash::FxHashMap; -use test_utils::{extract_offset, parse_fixture, parse_single_fixture, FixtureMeta, CURSOR_MARKER}; +use test_utils::{extract_offset, parse_fixture, parse_single_fixture, CURSOR_MARKER}; use vfs::{file_set::FileSet, VfsPath}; use crate::{ @@ -243,20 +243,18 @@ struct FileMeta { env: Env, } -impl From<&FixtureMeta> for ParsedMeta { - fn from(meta: &FixtureMeta) -> Self { - match meta { - FixtureMeta::File(f) => Self::File(FileMeta { - path: f.path.to_owned(), - krate: f.crate_name.to_owned(), - deps: f.deps.to_owned(), - cfg: f.cfg.to_owned(), - edition: f - .edition - .as_ref() - .map_or(Edition::Edition2018, |v| Edition::from_str(&v).unwrap()), - env: Env::from(f.env.iter()), - }), - } +impl From<&test_utils::FileMeta> for ParsedMeta { + fn from(f: &test_utils::FileMeta) -> Self { + Self::File(FileMeta { + path: f.path.to_owned(), + krate: f.crate_name.to_owned(), + deps: f.deps.to_owned(), + cfg: f.cfg.to_owned(), + edition: f + .edition + .as_ref() + .map_or(Edition::Edition2018, |v| Edition::from_str(&v).unwrap()), + env: Env::from(f.env.iter()), + }) } } -- cgit v1.2.3 From 21f751a0e5da5dd488612e25abfc545c259050e7 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 23 Jun 2020 18:34:50 +0200 Subject: Simplify --- crates/ra_db/src/fixture.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'crates/ra_db/src/fixture.rs') diff --git a/crates/ra_db/src/fixture.rs b/crates/ra_db/src/fixture.rs index 7f006487a..d65536bbc 100644 --- a/crates/ra_db/src/fixture.rs +++ b/crates/ra_db/src/fixture.rs @@ -61,7 +61,9 @@ use std::{str::FromStr, sync::Arc}; use ra_cfg::CfgOptions; use rustc_hash::FxHashMap; -use test_utils::{extract_offset, parse_fixture, parse_single_fixture, CURSOR_MARKER}; +use test_utils::{ + extract_offset, parse_fixture, parse_single_fixture, FixtureEntry, CURSOR_MARKER, +}; use vfs::{file_set::FileSet, VfsPath}; use crate::{ @@ -112,7 +114,7 @@ fn with_single_file(db: &mut dyn SourceDatabaseExt, ra_fixture: &str) -> FileId let fixture = parse_single_fixture(ra_fixture); let crate_graph = if let Some(entry) = fixture { - let meta = match ParsedMeta::from(&entry.meta) { + let meta = match ParsedMeta::from(&entry) { ParsedMeta::File(it) => it, }; @@ -165,7 +167,7 @@ fn with_files(db: &mut dyn SourceDatabaseExt, fixture: &str) -> Option it, }; assert!(meta.path.starts_with(&source_root_prefix)); @@ -243,8 +245,8 @@ struct FileMeta { env: Env, } -impl From<&test_utils::FileMeta> for ParsedMeta { - fn from(f: &test_utils::FileMeta) -> Self { +impl From<&FixtureEntry> for ParsedMeta { + fn from(f: &FixtureEntry) -> Self { Self::File(FileMeta { path: f.path.to_owned(), krate: f.crate_name.to_owned(), -- cgit v1.2.3 From 3486b47e5c4f71479cc3c876da1fd1dcbfcab257 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 23 Jun 2020 18:43:55 +0200 Subject: Simplify --- crates/ra_db/src/fixture.rs | 70 +++++++++------------------------------------ 1 file changed, 13 insertions(+), 57 deletions(-) (limited to 'crates/ra_db/src/fixture.rs') diff --git a/crates/ra_db/src/fixture.rs b/crates/ra_db/src/fixture.rs index d65536bbc..f786fb87f 100644 --- a/crates/ra_db/src/fixture.rs +++ b/crates/ra_db/src/fixture.rs @@ -61,9 +61,7 @@ use std::{str::FromStr, sync::Arc}; use ra_cfg::CfgOptions; use rustc_hash::FxHashMap; -use test_utils::{ - extract_offset, parse_fixture, parse_single_fixture, FixtureEntry, CURSOR_MARKER, -}; +use test_utils::{extract_offset, parse_fixture, FixtureEntry, CURSOR_MARKER}; use vfs::{file_set::FileSet, VfsPath}; use crate::{ @@ -76,20 +74,21 @@ pub const WORKSPACE: SourceRootId = SourceRootId(0); pub trait WithFixture: Default + SourceDatabaseExt + 'static { fn with_single_file(text: &str) -> (Self, FileId) { let mut db = Self::default(); - let file_id = with_single_file(&mut db, text); - (db, file_id) + let (_, files) = with_files(&mut db, text); + assert!(files.len() == 1); + (db, files[0]) } fn with_files(ra_fixture: &str) -> Self { let mut db = Self::default(); - let pos = with_files(&mut db, ra_fixture); + let (pos, _) = with_files(&mut db, ra_fixture); assert!(pos.is_none()); db } fn with_position(ra_fixture: &str) -> (Self, FilePosition) { let mut db = Self::default(); - let pos = with_files(&mut db, ra_fixture); + let (pos, _) = with_files(&mut db, ra_fixture); (db, pos.unwrap()) } @@ -104,54 +103,11 @@ pub trait WithFixture: Default + SourceDatabaseExt + 'static { impl WithFixture for DB {} -fn with_single_file(db: &mut dyn SourceDatabaseExt, ra_fixture: &str) -> FileId { - let file_id = FileId(0); - let mut file_set = vfs::file_set::FileSet::default(); - file_set.insert(file_id, vfs::VfsPath::new_virtual_path("/main.rs".to_string())); - - let source_root = SourceRoot::new_local(file_set); - - let fixture = parse_single_fixture(ra_fixture); - - let crate_graph = if let Some(entry) = fixture { - let meta = match ParsedMeta::from(&entry) { - ParsedMeta::File(it) => it, - }; - - let mut crate_graph = CrateGraph::default(); - crate_graph.add_crate_root( - file_id, - meta.edition, - meta.krate.map(|name| { - CrateName::new(&name).expect("Fixture crate name should not contain dashes") - }), - meta.cfg, - meta.env, - Default::default(), - ); - crate_graph - } else { - let mut crate_graph = CrateGraph::default(); - crate_graph.add_crate_root( - file_id, - Edition::Edition2018, - None, - CfgOptions::default(), - Env::default(), - Default::default(), - ); - crate_graph - }; - - db.set_file_text(file_id, Arc::new(ra_fixture.to_string())); - db.set_file_source_root(file_id, WORKSPACE); - db.set_source_root(WORKSPACE, Arc::new(source_root)); - db.set_crate_graph(Arc::new(crate_graph)); - - file_id -} - -fn with_files(db: &mut dyn SourceDatabaseExt, fixture: &str) -> Option { +fn with_files( + db: &mut dyn SourceDatabaseExt, + fixture: &str, +) -> (Option, Vec) { + let mut files = Vec::new(); let fixture = parse_fixture(fixture); let mut crate_graph = CrateGraph::default(); @@ -204,7 +160,7 @@ fn with_files(db: &mut dyn SourceDatabaseExt, fixture: &str) -> Option Option Date: Tue, 23 Jun 2020 18:46:56 +0200 Subject: Nicer API --- crates/ra_db/src/fixture.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'crates/ra_db/src/fixture.rs') diff --git a/crates/ra_db/src/fixture.rs b/crates/ra_db/src/fixture.rs index f786fb87f..6c13e62bb 100644 --- a/crates/ra_db/src/fixture.rs +++ b/crates/ra_db/src/fixture.rs @@ -61,7 +61,7 @@ use std::{str::FromStr, sync::Arc}; use ra_cfg::CfgOptions; use rustc_hash::FxHashMap; -use test_utils::{extract_offset, parse_fixture, FixtureEntry, CURSOR_MARKER}; +use test_utils::{extract_offset, Fixture, CURSOR_MARKER}; use vfs::{file_set::FileSet, VfsPath}; use crate::{ @@ -107,9 +107,9 @@ fn with_files( db: &mut dyn SourceDatabaseExt, fixture: &str, ) -> (Option, Vec) { - let mut files = Vec::new(); - let fixture = parse_fixture(fixture); + let fixture = Fixture::parse(fixture); + let mut files = Vec::new(); let mut crate_graph = CrateGraph::default(); let mut crates = FxHashMap::default(); let mut crate_deps = Vec::new(); @@ -201,8 +201,8 @@ struct FileMeta { env: Env, } -impl From<&FixtureEntry> for ParsedMeta { - fn from(f: &FixtureEntry) -> Self { +impl From<&Fixture> for ParsedMeta { + fn from(f: &Fixture) -> Self { Self::File(FileMeta { path: f.path.to_owned(), krate: f.crate_name.to_owned(), -- cgit v1.2.3 From 84cd28fddc89bfa75760e81f4fbc5aa21ce2742c Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 23 Jun 2020 18:56:26 +0200 Subject: Cut problematic dependency --- crates/ra_db/src/fixture.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'crates/ra_db/src/fixture.rs') diff --git a/crates/ra_db/src/fixture.rs b/crates/ra_db/src/fixture.rs index 6c13e62bb..ea52ec563 100644 --- a/crates/ra_db/src/fixture.rs +++ b/crates/ra_db/src/fixture.rs @@ -203,11 +203,15 @@ struct FileMeta { impl From<&Fixture> for ParsedMeta { fn from(f: &Fixture) -> Self { + let mut cfg = CfgOptions::default(); + f.cfg_atoms.iter().for_each(|it| cfg.insert_atom(it.into())); + f.cfg_key_values.iter().for_each(|(k, v)| cfg.insert_key_value(k.into(), v.into())); + Self::File(FileMeta { path: f.path.to_owned(), krate: f.crate_name.to_owned(), deps: f.deps.to_owned(), - cfg: f.cfg.to_owned(), + cfg, edition: f .edition .as_ref() -- cgit v1.2.3 From 295c8d4f7f9ce9d3dc67e8a988914d90424c1b7e Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 23 Jun 2020 20:38:36 +0200 Subject: Complicate Fixing test fallout unfortunately requires more work, we need to do it, but let's merge something at least! --- crates/ra_db/src/fixture.rs | 51 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 3 deletions(-) (limited to 'crates/ra_db/src/fixture.rs') diff --git a/crates/ra_db/src/fixture.rs b/crates/ra_db/src/fixture.rs index ea52ec563..20f291568 100644 --- a/crates/ra_db/src/fixture.rs +++ b/crates/ra_db/src/fixture.rs @@ -74,9 +74,8 @@ pub const WORKSPACE: SourceRootId = SourceRootId(0); pub trait WithFixture: Default + SourceDatabaseExt + 'static { fn with_single_file(text: &str) -> (Self, FileId) { let mut db = Self::default(); - let (_, files) = with_files(&mut db, text); - assert!(files.len() == 1); - (db, files[0]) + let file_id = with_single_file(&mut db, text); + (db, file_id) } fn with_files(ra_fixture: &str) -> Self { @@ -103,6 +102,52 @@ pub trait WithFixture: Default + SourceDatabaseExt + 'static { impl WithFixture for DB {} +fn with_single_file(db: &mut dyn SourceDatabaseExt, ra_fixture: &str) -> FileId { + let file_id = FileId(0); + let mut file_set = vfs::file_set::FileSet::default(); + file_set.insert(file_id, vfs::VfsPath::new_virtual_path("/main.rs".to_string())); + + let source_root = SourceRoot::new_local(file_set); + + let crate_graph = if let Some(meta) = ra_fixture.lines().find(|it| it.contains("//-")) { + let entry = Fixture::parse_single(meta.trim()); + let meta = match ParsedMeta::from(&entry) { + ParsedMeta::File(it) => it, + }; + + let mut crate_graph = CrateGraph::default(); + crate_graph.add_crate_root( + file_id, + meta.edition, + meta.krate.map(|name| { + CrateName::new(&name).expect("Fixture crate name should not contain dashes") + }), + meta.cfg, + meta.env, + Default::default(), + ); + crate_graph + } else { + let mut crate_graph = CrateGraph::default(); + crate_graph.add_crate_root( + file_id, + Edition::Edition2018, + None, + CfgOptions::default(), + Env::default(), + Default::default(), + ); + crate_graph + }; + + db.set_file_text(file_id, Arc::new(ra_fixture.to_string())); + db.set_file_source_root(file_id, WORKSPACE); + db.set_source_root(WORKSPACE, Arc::new(source_root)); + db.set_crate_graph(Arc::new(crate_graph)); + + file_id +} + fn with_files( db: &mut dyn SourceDatabaseExt, fixture: &str, -- cgit v1.2.3