diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-03 10:48:41 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-01-03 10:48:41 +0000 |
commit | b47c63a4bcefe93be3e5fe97b2a57489f13da493 (patch) | |
tree | f02b994b580aacd64a3b8172a17fa464a52b4713 /crates/hir_ty/src | |
parent | 354c1daedc91abd15ca0ce6ada417053ce45ecfa (diff) | |
parent | 85cc3cfec99a7d232384efae010bfbc8224f1351 (diff) |
Merge #7137
7137: Revert "Proper handling $crate and local_inner_macros" r=jonas-schievink a=jonas-schievink
Reverts rust-analyzer/rust-analyzer#7133
It caused a fairly significant performance regression.
bors r+
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/hir_ty/src')
-rw-r--r-- | crates/hir_ty/src/tests/macros.rs | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/crates/hir_ty/src/tests/macros.rs b/crates/hir_ty/src/tests/macros.rs index c64f0b5b5..1953da7be 100644 --- a/crates/hir_ty/src/tests/macros.rs +++ b/crates/hir_ty/src/tests/macros.rs | |||
@@ -371,37 +371,6 @@ expand!(); | |||
371 | } | 371 | } |
372 | 372 | ||
373 | #[test] | 373 | #[test] |
374 | fn infer_macro_with_dollar_crate_in_def_site() { | ||
375 | check_types( | ||
376 | r#" | ||
377 | //- /main.rs crate:main deps:foo | ||
378 | use foo::expand; | ||
379 | |||
380 | macro_rules! list { | ||
381 | ($($tt:tt)*) => { $($tt)* } | ||
382 | } | ||
383 | |||
384 | fn test() { | ||
385 | let r = expand!(); | ||
386 | r; | ||
387 | //^ u128 | ||
388 | } | ||
389 | |||
390 | //- /lib.rs crate:foo | ||
391 | #[macro_export] | ||
392 | macro_rules! expand { | ||
393 | () => { list!($crate::m!()) }; | ||
394 | } | ||
395 | |||
396 | #[macro_export] | ||
397 | macro_rules! m { | ||
398 | () => { 0u128 }; | ||
399 | } | ||
400 | "#, | ||
401 | ); | ||
402 | } | ||
403 | |||
404 | #[test] | ||
405 | fn infer_type_value_non_legacy_macro_use_as() { | 374 | fn infer_type_value_non_legacy_macro_use_as() { |
406 | check_infer( | 375 | check_infer( |
407 | r#" | 376 | r#" |