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_expand/src/name.rs | |
| 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_expand/src/name.rs')
| -rw-r--r-- | crates/ra_hir_expand/src/name.rs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crates/ra_hir_expand/src/name.rs b/crates/ra_hir_expand/src/name.rs index b2e10f445..133805bdb 100644 --- a/crates/ra_hir_expand/src/name.rs +++ b/crates/ra_hir_expand/src/name.rs | |||
| @@ -187,6 +187,13 @@ pub mod known { | |||
| 187 | PartialOrd, | 187 | PartialOrd, |
| 188 | Eq, | 188 | Eq, |
| 189 | PartialEq, | 189 | PartialEq, |
| 190 | // FIXME delete those after `ImportResolver` is removed. | ||
| 191 | hash, | ||
| 192 | fmt, | ||
| 193 | io, | ||
| 194 | Display, | ||
| 195 | Iterator, | ||
| 196 | Hasher, | ||
| 190 | ); | 197 | ); |
| 191 | 198 | ||
| 192 | // self/Self cannot be used as an identifier | 199 | // self/Self cannot be used as an identifier |