From 9738fb48a68bee087e441f09edfc56bdbd827f35 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 19 Feb 2019 19:51:48 +0300 Subject: remove ignored macro tests we need to significantly reengineer macros, so the tests as they exist are useless --- crates/ra_hir/src/nameres/tests.rs | 30 ------------------------------ crates/ra_ide_api/src/mock_analysis.rs | 2 +- crates/ra_ide_api/tests/test/main.rs | 19 +------------------ crates/test_utils/src/lib.rs | 2 +- 4 files changed, 3 insertions(+), 50 deletions(-) diff --git a/crates/ra_hir/src/nameres/tests.rs b/crates/ra_hir/src/nameres/tests.rs index 6402c89c0..9b151bb0c 100644 --- a/crates/ra_hir/src/nameres/tests.rs +++ b/crates/ra_hir/src/nameres/tests.rs @@ -401,36 +401,6 @@ fn name_res_works_for_broken_modules() { ); } -#[test] -#[ignore] -fn item_map_contains_items_from_expansions() { - let (item_map, module_id) = item_map( - " - //- /lib.rs - mod foo; - - use crate::foo::bar::Baz; - <|> - - //- /foo/mod.rs - pub mod bar; - - //- /foo/bar.rs - salsa::query_group! { - trait Baz {} - } - ", - ); - check_module_item_map( - &item_map, - module_id, - " - Baz: t - foo: t - ", - ); -} - #[test] fn item_map_using_self() { let (item_map, module_id) = item_map( diff --git a/crates/ra_ide_api/src/mock_analysis.rs b/crates/ra_ide_api/src/mock_analysis.rs index 550d69641..cb12dd0b1 100644 --- a/crates/ra_ide_api/src/mock_analysis.rs +++ b/crates/ra_ide_api/src/mock_analysis.rs @@ -18,7 +18,7 @@ impl MockAnalysis { } /// Creates `MockAnalysis` using a fixture data in the following format: /// - /// ```rust,ignore + /// ```not_rust /// //- /main.rs /// mod foo; /// fn main() {} diff --git a/crates/ra_ide_api/tests/test/main.rs b/crates/ra_ide_api/tests/test/main.rs index a83fbe07b..ff1a0e46b 100644 --- a/crates/ra_ide_api/tests/test/main.rs +++ b/crates/ra_ide_api/tests/test/main.rs @@ -4,7 +4,7 @@ use ra_ide_api::{ AnalysisChange, CrateGraph, Edition::Edition2018, Query, NavigationTarget, ReferenceSearchResult, }; -use ra_syntax::{TextRange, SmolStr}; +use ra_syntax::SmolStr; #[test] fn test_unresolved_module_diagnostic() { @@ -138,20 +138,3 @@ mod foo { assert_eq!(s.name(), "FooInner"); assert_eq!(s.container_name(), Some(&SmolStr::new("foo"))); } - -#[test] -#[ignore] -fn world_symbols_include_stuff_from_macros() { - let (analysis, _) = single_file( - " -salsa::query_group! { -pub trait HirDatabase: SyntaxDatabase {} -} - ", - ); - - let mut symbols = analysis.symbol_search(Query::new("Hir".into())).unwrap(); - let s = symbols.pop().unwrap(); - assert_eq!(s.name(), "HirDatabase"); - assert_eq!(s.full_range(), TextRange::from_to(33.into(), 44.into())); -} diff --git a/crates/test_utils/src/lib.rs b/crates/test_utils/src/lib.rs index 4d83af00c..7f55779cf 100644 --- a/crates/test_utils/src/lib.rs +++ b/crates/test_utils/src/lib.rs @@ -115,7 +115,7 @@ pub struct FixtureEntry { /// Parses text which looks like this: /// -/// ```rust,ignore +/// ```not_rust /// //- some meta /// line 1 /// line 2 -- cgit v1.2.3