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/nameres | |
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/nameres')
-rw-r--r-- | crates/ra_hir/src/nameres/collector.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir/src/nameres/raw.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/nameres/collector.rs b/crates/ra_hir/src/nameres/collector.rs index 693c3fe8e..3bfef799d 100644 --- a/crates/ra_hir/src/nameres/collector.rs +++ b/crates/ra_hir/src/nameres/collector.rs | |||
@@ -556,7 +556,7 @@ where | |||
556 | 556 | ||
557 | fn define_def(&mut self, def: &raw::DefData) { | 557 | fn define_def(&mut self, def: &raw::DefData) { |
558 | let module = Module { krate: self.def_collector.def_map.krate, module_id: self.module_id }; | 558 | let module = Module { krate: self.def_collector.def_map.krate, module_id: self.module_id }; |
559 | let ctx = LocationCtx::new(self.def_collector.db, module, self.file_id.into()); | 559 | let ctx = LocationCtx::new(self.def_collector.db, module, self.file_id); |
560 | 560 | ||
561 | macro_rules! def { | 561 | macro_rules! def { |
562 | ($kind:ident, $ast_id:ident) => { | 562 | ($kind:ident, $ast_id:ident) => { |
diff --git a/crates/ra_hir/src/nameres/raw.rs b/crates/ra_hir/src/nameres/raw.rs index 21935dbb9..a0afe282c 100644 --- a/crates/ra_hir/src/nameres/raw.rs +++ b/crates/ra_hir/src/nameres/raw.rs | |||
@@ -69,7 +69,7 @@ impl RawItems { | |||
69 | ) -> (Arc<RawItems>, Arc<ImportSourceMap>) { | 69 | ) -> (Arc<RawItems>, Arc<ImportSourceMap>) { |
70 | let mut collector = RawItemsCollector { | 70 | let mut collector = RawItemsCollector { |
71 | raw_items: RawItems::default(), | 71 | raw_items: RawItems::default(), |
72 | source_ast_id_map: db.ast_id_map(file_id.into()), | 72 | source_ast_id_map: db.ast_id_map(file_id), |
73 | source_map: ImportSourceMap::default(), | 73 | source_map: ImportSourceMap::default(), |
74 | }; | 74 | }; |
75 | if let Some(node) = db.parse_or_expand(file_id) { | 75 | if let Some(node) = db.parse_or_expand(file_id) { |