aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_def
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-01-15 19:38:10 +0000
committerGitHub <[email protected]>2020-01-15 19:38:10 +0000
commitc78d269b66dd7e02321bf447eef1375c81f66a1e (patch)
tree8ec28f0ecd713783aa4d7032bdf324ace7bc8911 /crates/ra_hir_def
parentaa2e13b37f4508168fb064a79d0190fa705d8a47 (diff)
parentaaef88db0e2602e010f78e26a80d974be12c1f71 (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_def')
-rw-r--r--crates/ra_hir_def/src/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir_def/src/lib.rs b/crates/ra_hir_def/src/lib.rs
index ebc12e891..feb3a300d 100644
--- a/crates/ra_hir_def/src/lib.rs
+++ b/crates/ra_hir_def/src/lib.rs
@@ -332,7 +332,7 @@ pub enum VariantId {
332 StructId(StructId), 332 StructId(StructId),
333 UnionId(UnionId), 333 UnionId(UnionId),
334} 334}
335impl_froms!(VariantId: EnumVariantId, StructId); 335impl_froms!(VariantId: EnumVariantId, StructId, UnionId);
336 336
337trait Intern { 337trait Intern {
338 type ID; 338 type ID;