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_project_model | |
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_project_model')
-rw-r--r-- | crates/ra_project_model/src/cargo_workspace.rs | 7 | ||||
-rw-r--r-- | crates/ra_project_model/src/lib.rs | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs index 71976071f..5a1657788 100644 --- a/crates/ra_project_model/src/cargo_workspace.rs +++ b/crates/ra_project_model/src/cargo_workspace.rs | |||
@@ -137,7 +137,7 @@ impl CargoWorkspace { | |||
137 | for meta_pkg in meta.packages { | 137 | for meta_pkg in meta.packages { |
138 | let is_member = ws_members.contains(&meta_pkg.id); | 138 | let is_member = ws_members.contains(&meta_pkg.id); |
139 | let pkg = packages.alloc(PackageData { | 139 | let pkg = packages.alloc(PackageData { |
140 | name: meta_pkg.name.into(), | 140 | name: meta_pkg.name, |
141 | manifest: meta_pkg.manifest_path.clone(), | 141 | manifest: meta_pkg.manifest_path.clone(), |
142 | targets: Vec::new(), | 142 | targets: Vec::new(), |
143 | is_member, | 143 | is_member, |
@@ -149,7 +149,7 @@ impl CargoWorkspace { | |||
149 | for meta_tgt in meta_pkg.targets { | 149 | for meta_tgt in meta_pkg.targets { |
150 | let tgt = targets.alloc(TargetData { | 150 | let tgt = targets.alloc(TargetData { |
151 | pkg, | 151 | pkg, |
152 | name: meta_tgt.name.into(), | 152 | name: meta_tgt.name, |
153 | root: meta_tgt.src_path.clone(), | 153 | root: meta_tgt.src_path.clone(), |
154 | kind: TargetKind::new(meta_tgt.kind.as_slice()), | 154 | kind: TargetKind::new(meta_tgt.kind.as_slice()), |
155 | }); | 155 | }); |
@@ -160,8 +160,7 @@ impl CargoWorkspace { | |||
160 | for node in resolve.nodes { | 160 | for node in resolve.nodes { |
161 | let source = pkg_by_id[&node.id]; | 161 | let source = pkg_by_id[&node.id]; |
162 | for dep_node in node.deps { | 162 | for dep_node in node.deps { |
163 | let dep = | 163 | let dep = PackageDependency { name: dep_node.name, pkg: pkg_by_id[&dep_node.pkg] }; |
164 | PackageDependency { name: dep_node.name.into(), pkg: pkg_by_id[&dep_node.pkg] }; | ||
165 | packages[source].dependencies.push(dep); | 164 | packages[source].dependencies.push(dep); |
166 | } | 165 | } |
167 | } | 166 | } |
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs index 63eb7041e..4ae7f685c 100644 --- a/crates/ra_project_model/src/lib.rs +++ b/crates/ra_project_model/src/lib.rs | |||
@@ -70,7 +70,7 @@ impl ProjectRoot { | |||
70 | }) | 70 | }) |
71 | }; | 71 | }; |
72 | 72 | ||
73 | let hidden = dir_path.components().any(|c| c.as_str().starts_with(".")); | 73 | let hidden = dir_path.components().any(|c| c.as_str().starts_with('.')); |
74 | 74 | ||
75 | !is_ignored && !hidden | 75 | !is_ignored && !hidden |
76 | } | 76 | } |