Skip to content

Commit b9f809a

Browse files
VeykrilVeykril
committed
Rename test fixture crates to ra_test_fixture
1 parent c6e8a0e commit b9f809a

File tree

9 files changed

+407
-397
lines changed

9 files changed

+407
-397
lines changed

‎src/tools/rust-analyzer/crates/hir-def/src/body/tests.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
mod block;
22

3-
use base_db::SourceDatabase;
43
use expect_test::{expect, Expect};
54
use test_fixture::WithFixture;
65

@@ -11,7 +10,7 @@ use super::*;
1110
fn lower(ra_fixture: &str) -> (TestDB, Arc<Body>, DefWithBodyId) {
1211
let db = TestDB::with_files(ra_fixture);
1312

14-
let krate = db.crate_graph().iter().next().unwrap();
13+
let krate = db.fetch_test_crate();
1514
let def_map = db.crate_def_map(krate);
1615
let mut fn_def = None;
1716
'outer: for (_, module) in def_map.modules() {

‎src/tools/rust-analyzer/crates/hir-def/src/macro_expansion_tests/mod.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ mod proc_macros;
1616

1717
use std::{iter, ops::Range, sync};
1818

19-
use base_db::SourceDatabase;
2019
use expect_test::Expect;
2120
use hir_expand::{
2221
db::ExpandDatabase,
@@ -63,7 +62,7 @@ pub fn identity_when_valid(_attr: TokenStream, item: TokenStream) -> TokenStream
6362
},
6463
)];
6564
let db = TestDB::with_files_extra_proc_macros(ra_fixture, extra_proc_macros);
66-
let krate = db.crate_graph().iter().next().unwrap();
65+
let krate = db.fetch_test_crate();
6766
let def_map = db.crate_def_map(krate);
6867
let local_id = DefMap::ROOT;
6968
let module = def_map.module_id(local_id);

‎src/tools/rust-analyzer/crates/hir-def/src/nameres/tests.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ use crate::{db::DefDatabase, nameres::DefMap, test_db::TestDB};
1313

1414
fn compute_crate_def_map(ra_fixture: &str) -> Arc<DefMap> {
1515
let db = TestDB::with_files(ra_fixture);
16-
let krate = db.crate_graph().iter().next().unwrap();
16+
let krate = db.fetch_test_crate();
1717
db.crate_def_map(krate)
1818
}
1919

2020
fn render_crate_def_map(ra_fixture: &str) -> String {
2121
let db = TestDB::with_files(ra_fixture);
22-
let krate = db.crate_graph().iter().next().unwrap();
22+
let krate = db.fetch_test_crate();
2323
db.crate_def_map(krate).dump(&db)
2424
}
2525

‎src/tools/rust-analyzer/crates/hir-def/src/nameres/tests/incremental.rs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
use base_db::{SourceDatabase, SourceDatabaseFileInputExt as _};
1+
use base_db::SourceDatabaseFileInputExt as _;
22
use test_fixture::WithFixture;
33

44
use crate::{db::DefDatabase, nameres::tests::TestDB, AdtId, ModuleDefId};
55

66
fn check_def_map_is_not_recomputed(ra_fixture_initial: &str, ra_fixture_change: &str) {
77
let (mut db, pos) = TestDB::with_position(ra_fixture_initial);
8-
let krate = {
9-
let crate_graph = db.crate_graph();
10-
// Some of these tests use minicore/proc-macros which will be injected as the first crate
11-
let krate = crate_graph.iter().next().unwrap();
12-
krate
13-
};
8+
let krate = db.fetch_test_crate();
149
{
1510
let events = db.log_executed(|| {
1611
db.crate_def_map(krate);
@@ -121,6 +116,8 @@ fn f() { foo }
121116
);
122117
}
123118

119+
// Would be nice if this was the case, but as attribute inputs are stored in the item tree, this is
120+
// not currently the case.
124121
// #[test]
125122
// fn typing_inside_an_attribute_arg_should_not_invalidate_def_map() {
126123
// check_def_map_is_not_recomputed(
@@ -200,6 +197,8 @@ pub struct S {}
200197
);
201198
}
202199

200+
// Would be nice if this was the case, but as attribute inputs are stored in the item tree, this is
201+
// not currently the case.
203202
// #[test]
204203
// fn typing_inside_a_derive_should_not_invalidate_def_map() {
205204
// check_def_map_is_not_recomputed(

‎src/tools/rust-analyzer/crates/hir-def/src/test_db.rs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,19 @@ impl FileLoader for TestDB {
7878
}
7979

8080
impl TestDB {
81+
pub(crate) fn fetch_test_crate(&self) -> CrateId {
82+
let crate_graph = self.crate_graph();
83+
let it = crate_graph
84+
.iter()
85+
.find(|&idx| {
86+
crate_graph[idx].display_name.as_ref().map(|it| it.canonical_name().as_str())
87+
== Some("ra_test_fixture")
88+
})
89+
.or_else(|| crate_graph.iter().next())
90+
.unwrap();
91+
it
92+
}
93+
8194
pub(crate) fn module_for_file(&self, file_id: FileId) -> ModuleId {
8295
for &krate in self.relevant_crates(file_id).iter() {
8396
let crate_def_map = self.crate_def_map(krate);

‎src/tools/rust-analyzer/crates/ide-assists/src/handlers/generate_documentation_template.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ pub(crate) fn generate_documentation_template(
8888
// /// # Examples
8989
// ///
9090
// /// ```
91-
// /// use test::add;
91+
// /// use ra_test_fixture::add;
9292
// ///
9393
// /// assert_eq!(add(a, b), );
9494
// /// ```
@@ -596,7 +596,7 @@ pub fn noop_with_param(_a: i32) {}
596596
/// # Examples
597597
///
598598
/// ```
599-
/// use test::noop_with_param;
599+
/// use ra_test_fixture::noop_with_param;
600600
///
601601
/// noop_with_param(_a);
602602
/// ```
@@ -641,7 +641,7 @@ pub unsafe fn noop_unsafe() {}
641641
/// # Examples
642642
///
643643
/// ```
644-
/// use test::noop_unsafe;
644+
/// use ra_test_fixture::noop_unsafe;
645645
///
646646
/// unsafe { noop_unsafe() };
647647
/// ```
@@ -758,7 +758,7 @@ pub fn returns_a_value$0() -> i32 {
758758
/// # Examples
759759
///
760760
/// ```
761-
/// use test::returns_a_value;
761+
/// use ra_test_fixture::returns_a_value;
762762
///
763763
/// assert_eq!(returns_a_value(), );
764764
/// ```
@@ -807,7 +807,7 @@ pub fn modifies_a_value$0(a: &mut i32) {
807807
/// # Examples
808808
///
809809
/// ```
810-
/// use test::modifies_a_value;
810+
/// use ra_test_fixture::modifies_a_value;
811811
///
812812
/// let mut a = ;
813813
/// modifies_a_value(&mut a);
@@ -836,7 +836,7 @@ pub fn sum3$0(a: i32, b: i32, c: i32) -> i32 {
836836
/// # Examples
837837
///
838838
/// ```
839-
/// use test::sum3;
839+
/// use ra_test_fixture::sum3;
840840
///
841841
/// let result = sum3(a, b, c);
842842
/// assert_eq!(result, );
@@ -868,7 +868,7 @@ pub mod a {
868868
/// # Examples
869869
///
870870
/// ```
871-
/// use test::a::b::noop;
871+
/// use ra_test_fixture::a::b::noop;
872872
///
873873
/// noop();
874874
/// ```
@@ -898,7 +898,7 @@ impl MyStruct {
898898
/// # Examples
899899
///
900900
/// ```
901-
/// use test::MyStruct;
901+
/// use ra_test_fixture::MyStruct;
902902
///
903903
/// MyStruct::noop();
904904
/// ```
@@ -1169,7 +1169,7 @@ impl<T> MyGenericStruct<T> {
11691169
/// # Examples
11701170
///
11711171
/// ```
1172-
/// use test::MyGenericStruct;
1172+
/// use ra_test_fixture::MyGenericStruct;
11731173
///
11741174
/// let my_generic_struct = ;
11751175
/// my_generic_struct.consume();
@@ -1199,7 +1199,7 @@ impl<T> MyGenericStruct<T> {
11991199
/// # Examples
12001200
///
12011201
/// ```
1202-
/// use test::MyGenericStruct;
1202+
/// use ra_test_fixture::MyGenericStruct;
12031203
///
12041204
/// let mut my_generic_struct = ;
12051205
/// my_generic_struct.modify(new_value);

‎src/tools/rust-analyzer/crates/ide-assists/src/tests/generated.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1392,7 +1392,7 @@ pub fn add(a: i32, b: i32) -> i32 { a + b }
13921392
/// # Examples
13931393
///
13941394
/// ```
1395-
/// use test::add;
1395+
/// use ra_test_fixture::add;
13961396
///
13971397
/// assert_eq!(add(a, b), );
13981398
/// ```

0 commit comments

Comments
 (0)