diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-04 22:56:36 +0100 |
---|---|---|
committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-04 22:56:36 +0100 |
commit | b1bf434dfcf81ac681a9e152628f9eecde68470a (patch) | |
tree | 51ea069481d3a5eefa9ec1f558a12c85690dabce /crates/ra_hir/src/resolve.rs | |
parent | c6a6e43372de9530ec7df0f38352466ed107e1a2 (diff) | |
parent | e7fb6c83cc33facf0d74e253bd193afc46b1dc5c (diff) |
Merge #1482
1482: Some clippy fixes for 1.36 r=kjeremy a=kjeremy
Some clippy fixes now that 1.36 is released. ~~Plus the requisite format run (I can rebase after #1481 is merged to make this cleaner) .~~
The change from `map(|it| *it)` to `copied()` changes the minimum rust stable to 1.36.
Co-authored-by: Jeremy Kolb <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/resolve.rs')
-rw-r--r-- | crates/ra_hir/src/resolve.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs index fc981e9b3..c8be27e54 100644 --- a/crates/ra_hir/src/resolve.rs +++ b/crates/ra_hir/src/resolve.rs | |||
@@ -272,7 +272,7 @@ impl Scope { | |||
272 | }, | 272 | }, |
273 | Scope::ImplBlockScope(i) => { | 273 | Scope::ImplBlockScope(i) => { |
274 | if name.as_known_name() == Some(KnownName::SelfType) { | 274 | if name.as_known_name() == Some(KnownName::SelfType) { |
275 | PerNs::types(Resolution::SelfType(i.clone())) | 275 | PerNs::types(Resolution::SelfType(*i)) |
276 | } else { | 276 | } else { |
277 | PerNs::none() | 277 | PerNs::none() |
278 | } | 278 | } |
@@ -317,7 +317,7 @@ impl Scope { | |||
317 | } | 317 | } |
318 | } | 318 | } |
319 | Scope::ImplBlockScope(i) => { | 319 | Scope::ImplBlockScope(i) => { |
320 | f(Name::self_type(), PerNs::types(Resolution::SelfType(i.clone()))); | 320 | f(Name::self_type(), PerNs::types(Resolution::SelfType(*i))); |
321 | } | 321 | } |
322 | Scope::ExprScope(e) => { | 322 | Scope::ExprScope(e) => { |
323 | e.expr_scopes.entries(e.scope_id).iter().for_each(|e| { | 323 | e.expr_scopes.entries(e.scope_id).iter().for_each(|e| { |