diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-11 16:10:34 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-11 16:10:34 +0000 |
commit | a180674986df6ff4c1934dc92f29b49e607477db (patch) | |
tree | e36ad67c76104dad8c7fafa7514631a7b7b6a97f | |
parent | af62fde57fe58f4aa06608568dc26535731800a0 (diff) | |
parent | dc951098f6a981b36d5559dc12d7c96b18ac411b (diff) |
Merge #789
789: remove useless hash r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r-- | crates/ra_hir/src/macros.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir/src/module_tree.rs | 2 | ||||
-rw-r--r-- | crates/ra_mbe/src/lib.rs | 2 | ||||
-rw-r--r-- | crates/ra_mbe/src/mbe_expander.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_hir/src/macros.rs b/crates/ra_hir/src/macros.rs index 95925159f..a8070637e 100644 --- a/crates/ra_hir/src/macros.rs +++ b/crates/ra_hir/src/macros.rs | |||
@@ -17,7 +17,7 @@ use ra_syntax::{ | |||
17 | use crate::{MacroCallId, PersistentHirDatabase}; | 17 | use crate::{MacroCallId, PersistentHirDatabase}; |
18 | 18 | ||
19 | // Hard-coded defs for now :-( | 19 | // Hard-coded defs for now :-( |
20 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 20 | #[derive(Debug, Clone, PartialEq, Eq)] |
21 | pub enum MacroDef { | 21 | pub enum MacroDef { |
22 | Vec, | 22 | Vec, |
23 | QueryGroup, | 23 | QueryGroup, |
diff --git a/crates/ra_hir/src/module_tree.rs b/crates/ra_hir/src/module_tree.rs index 1f19ee191..99c2115e1 100644 --- a/crates/ra_hir/src/module_tree.rs +++ b/crates/ra_hir/src/module_tree.rs | |||
@@ -115,7 +115,7 @@ pub struct ModuleTree { | |||
115 | links: Arena<LinkId, LinkData>, | 115 | links: Arena<LinkId, LinkData>, |
116 | } | 116 | } |
117 | 117 | ||
118 | #[derive(Debug, PartialEq, Eq, Hash)] | 118 | #[derive(Debug, PartialEq, Eq)] |
119 | pub struct ModuleData { | 119 | pub struct ModuleData { |
120 | file_id: HirFileId, | 120 | file_id: HirFileId, |
121 | /// Points to `ast::Module`, `None` for the whole file. | 121 | /// Points to `ast::Module`, `None` for the whole file. |
diff --git a/crates/ra_mbe/src/lib.rs b/crates/ra_mbe/src/lib.rs index b09837831..87782e5b9 100644 --- a/crates/ra_mbe/src/lib.rs +++ b/crates/ra_mbe/src/lib.rs | |||
@@ -26,7 +26,7 @@ pub use tt::{Delimiter, Punct}; | |||
26 | 26 | ||
27 | pub use crate::syntax_bridge::ast_to_token_tree; | 27 | pub use crate::syntax_bridge::ast_to_token_tree; |
28 | 28 | ||
29 | /// This struct contains AST for a single `macro_rules` defenition. What might | 29 | /// This struct contains AST for a single `macro_rules` definition. What might |
30 | /// be very confusing is that AST has almost exactly the same shape as | 30 | /// be very confusing is that AST has almost exactly the same shape as |
31 | /// `tt::TokenTree`, but there's a crucial difference: in macro rules, `$ident` | 31 | /// `tt::TokenTree`, but there's a crucial difference: in macro rules, `$ident` |
32 | /// and `$()*` have special meaning (see `Var` and `Repeat` data structures) | 32 | /// and `$()*` have special meaning (see `Var` and `Repeat` data structures) |
diff --git a/crates/ra_mbe/src/mbe_expander.rs b/crates/ra_mbe/src/mbe_expander.rs index 31531f4c9..eec713d9c 100644 --- a/crates/ra_mbe/src/mbe_expander.rs +++ b/crates/ra_mbe/src/mbe_expander.rs | |||
@@ -1,4 +1,4 @@ | |||
1 | /// This module takes a (parsed) defenition of `macro_rules` invocation, a | 1 | /// This module takes a (parsed) definition of `macro_rules` invocation, a |
2 | /// `tt::TokenTree` representing an argument of macro invocation, and produces a | 2 | /// `tt::TokenTree` representing an argument of macro invocation, and produces a |
3 | /// `tt::TokenTree` for the result of the expansion. | 3 | /// `tt::TokenTree` for the result of the expansion. |
4 | use rustc_hash::FxHashMap; | 4 | use rustc_hash::FxHashMap; |