diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-02-02 13:06:14 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-02-02 13:06:14 +0000 |
commit | e24829909adeccf4b40ab362d48cab4c5f1178dc (patch) | |
tree | 2cb1799491dd5a0f408ad749fbe27c565b0cfa7f /crates/ra_hir_def/src | |
parent | dce7dc44be948bb6b73b79ce284ec2eb83811ae8 (diff) | |
parent | 2ee94e3e24a8cda1594eadba9c64a553ec046818 (diff) |
Merge #2982
2982: Merge imports when auto importing r=flodiebold a=SomeoneToIgnore
Co-authored-by: Kirill Bulatov <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src')
-rw-r--r-- | crates/ra_hir_def/src/path.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir_def/src/path.rs b/crates/ra_hir_def/src/path.rs index ab290e2c9..a150b899f 100644 --- a/crates/ra_hir_def/src/path.rs +++ b/crates/ra_hir_def/src/path.rs | |||
@@ -16,13 +16,13 @@ use ra_syntax::ast; | |||
16 | 16 | ||
17 | use crate::{type_ref::TypeRef, InFile}; | 17 | use crate::{type_ref::TypeRef, InFile}; |
18 | 18 | ||
19 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 19 | #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] |
20 | pub struct ModPath { | 20 | pub struct ModPath { |
21 | pub kind: PathKind, | 21 | pub kind: PathKind, |
22 | pub segments: Vec<Name>, | 22 | pub segments: Vec<Name>, |
23 | } | 23 | } |
24 | 24 | ||
25 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 25 | #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] |
26 | pub enum PathKind { | 26 | pub enum PathKind { |
27 | Plain, | 27 | Plain, |
28 | /// `self::` is `Super(0)` | 28 | /// `self::` is `Super(0)` |