diff options
Diffstat (limited to 'crates')
-rw-r--r-- | crates/hir_expand/src/db.rs | 5 | ||||
-rw-r--r-- | crates/rust-analyzer/src/integrated_benchmarks.rs | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/crates/hir_expand/src/db.rs b/crates/hir_expand/src/db.rs index 43f787b34..2eaab1efb 100644 --- a/crates/hir_expand/src/db.rs +++ b/crates/hir_expand/src/db.rs | |||
@@ -27,10 +27,15 @@ const TOKEN_LIMIT: usize = 524288; | |||
27 | 27 | ||
28 | #[derive(Debug, Clone, Eq, PartialEq)] | 28 | #[derive(Debug, Clone, Eq, PartialEq)] |
29 | pub enum TokenExpander { | 29 | pub enum TokenExpander { |
30 | /// Old-style `macro_rules`. | ||
30 | MacroRules(mbe::MacroRules), | 31 | MacroRules(mbe::MacroRules), |
32 | /// AKA macros 2.0. | ||
31 | MacroDef(mbe::MacroDef), | 33 | MacroDef(mbe::MacroDef), |
34 | /// Stuff like `line!` and `file!`. | ||
32 | Builtin(BuiltinFnLikeExpander), | 35 | Builtin(BuiltinFnLikeExpander), |
36 | /// `derive(Copy)` and such. | ||
33 | BuiltinDerive(BuiltinDeriveExpander), | 37 | BuiltinDerive(BuiltinDeriveExpander), |
38 | /// The thing we love the most here in rust-analyzer -- procedural macros. | ||
34 | ProcMacro(ProcMacroExpander), | 39 | ProcMacro(ProcMacroExpander), |
35 | } | 40 | } |
36 | 41 | ||
diff --git a/crates/rust-analyzer/src/integrated_benchmarks.rs b/crates/rust-analyzer/src/integrated_benchmarks.rs index 411446b04..3dcbe397a 100644 --- a/crates/rust-analyzer/src/integrated_benchmarks.rs +++ b/crates/rust-analyzer/src/integrated_benchmarks.rs | |||
@@ -21,8 +21,7 @@ use crate::cli::load_cargo::{load_workspace_at, LoadCargoConfig}; | |||
21 | 21 | ||
22 | #[test] | 22 | #[test] |
23 | fn integrated_highlighting_benchmark() { | 23 | fn integrated_highlighting_benchmark() { |
24 | // Don't run slow benchmark by default | 24 | if std::env::var("RUN_SLOW_BENCHES").is_err() { |
25 | if true { | ||
26 | return; | 25 | return; |
27 | } | 26 | } |
28 | 27 | ||
@@ -76,8 +75,7 @@ fn integrated_highlighting_benchmark() { | |||
76 | 75 | ||
77 | #[test] | 76 | #[test] |
78 | fn integrated_completion_benchmark() { | 77 | fn integrated_completion_benchmark() { |
79 | // Don't run slow benchmark by default | 78 | if std::env::var("RUN_SLOW_BENCHES").is_err() { |
80 | if true { | ||
81 | return; | 79 | return; |
82 | } | 80 | } |
83 | 81 | ||