diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-06-04 23:14:46 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-06-04 23:14:46 +0100 |
commit | 5deb907b4321d8328978d3322b0826b781814452 (patch) | |
tree | 2baa3b75b1ef62c02617c37ba9b800c41a3dd102 /crates/ra_hir/src/traits.rs | |
parent | 8bd0e844247dc28d6ceb24b00f3cc3396bd5bf03 (diff) | |
parent | aa30c4909ebb1e85f1591f465c9e2875aa4d394e (diff) |
Merge #1374
1374: Implement `cargo lint` and fix some clippy errors r=alanhdu a=alanhdu
This creates a `cargo lint` command that runs clippy with certain lints disabled. I've also gone ahead and fixed some of the lint errors, although there are many more still to go.
cc #848
Co-authored-by: Alan Du <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/traits.rs')
-rw-r--r-- | crates/ra_hir/src/traits.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/crates/ra_hir/src/traits.rs b/crates/ra_hir/src/traits.rs index 2a7c2b791..967654e97 100644 --- a/crates/ra_hir/src/traits.rs +++ b/crates/ra_hir/src/traits.rs | |||
@@ -77,13 +77,10 @@ impl TraitItemsIndex { | |||
77 | pub(crate) fn trait_items_index(db: &impl DefDatabase, module: Module) -> TraitItemsIndex { | 77 | pub(crate) fn trait_items_index(db: &impl DefDatabase, module: Module) -> TraitItemsIndex { |
78 | let mut index = TraitItemsIndex { traits_by_def: FxHashMap::default() }; | 78 | let mut index = TraitItemsIndex { traits_by_def: FxHashMap::default() }; |
79 | for decl in module.declarations(db) { | 79 | for decl in module.declarations(db) { |
80 | match decl { | 80 | if let crate::ModuleDef::Trait(tr) = decl { |
81 | crate::ModuleDef::Trait(tr) => { | 81 | for item in tr.trait_data(db).items() { |
82 | for item in tr.trait_data(db).items() { | 82 | index.traits_by_def.insert(*item, tr); |
83 | index.traits_by_def.insert(*item, tr); | ||
84 | } | ||
85 | } | 83 | } |
86 | _ => {} | ||
87 | } | 84 | } |
88 | } | 85 | } |
89 | index | 86 | index |