diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-01-15 19:38:10 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-01-15 19:38:10 +0000 |
commit | c78d269b66dd7e02321bf447eef1375c81f66a1e (patch) | |
tree | 8ec28f0ecd713783aa4d7032bdf324ace7bc8911 /crates/ra_hir/src/lib.rs | |
parent | aa2e13b37f4508168fb064a79d0190fa705d8a47 (diff) | |
parent | aaef88db0e2602e010f78e26a80d974be12c1f71 (diff) |
Merge #2837
2837: Accidentally quadratic r=matklad a=matklad
Our syntax highlighting is accdentally quadratic. Current state of the PR fixes it in a pretty crude way, looks like for the proper fix we need to redo how source-analyzer works.
**NB:** don't be scared by diff stats, that's mostly a test-data file
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/lib.rs')
-rw-r--r-- | crates/ra_hir/src/lib.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index a1cf89010..a2350573c 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs | |||
@@ -8,7 +8,7 @@ | |||
8 | #![recursion_limit = "512"] | 8 | #![recursion_limit = "512"] |
9 | 9 | ||
10 | macro_rules! impl_froms { | 10 | macro_rules! impl_froms { |
11 | ($e:ident: $($v:ident $(($($sv:ident),*))?),*) => { | 11 | ($e:ident: $($v:ident $(($($sv:ident),*))?),*$(,)?) => { |
12 | $( | 12 | $( |
13 | impl From<$v> for $e { | 13 | impl From<$v> for $e { |
14 | fn from(it: $v) -> $e { | 14 | fn from(it: $v) -> $e { |
@@ -28,6 +28,7 @@ macro_rules! impl_froms { | |||
28 | 28 | ||
29 | pub mod db; | 29 | pub mod db; |
30 | pub mod source_analyzer; | 30 | pub mod source_analyzer; |
31 | pub mod source_binder; | ||
31 | 32 | ||
32 | pub mod diagnostics; | 33 | pub mod diagnostics; |
33 | 34 | ||
@@ -47,6 +48,7 @@ pub use crate::{ | |||
47 | from_source::FromSource, | 48 | from_source::FromSource, |
48 | has_source::HasSource, | 49 | has_source::HasSource, |
49 | source_analyzer::{PathResolution, ScopeEntryWithSyntax, SourceAnalyzer}, | 50 | source_analyzer::{PathResolution, ScopeEntryWithSyntax, SourceAnalyzer}, |
51 | source_binder::SourceBinder, | ||
50 | }; | 52 | }; |
51 | 53 | ||
52 | pub use hir_def::{ | 54 | pub use hir_def::{ |