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/expr | |
| 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/expr')
| -rw-r--r-- | crates/ra_hir/src/expr/scope.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir/src/expr/scope.rs b/crates/ra_hir/src/expr/scope.rs index f27cc6e8d..28fd52684 100644 --- a/crates/ra_hir/src/expr/scope.rs +++ b/crates/ra_hir/src/expr/scope.rs | |||
| @@ -72,7 +72,7 @@ impl ExprScopes { | |||
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | pub(crate) fn scope_for(&self, expr: ExprId) -> Option<ScopeId> { | 74 | pub(crate) fn scope_for(&self, expr: ExprId) -> Option<ScopeId> { |
| 75 | self.scope_by_expr.get(&expr).map(|&scope| scope) | 75 | self.scope_by_expr.get(&expr).copied() |
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | pub(crate) fn scope_by_expr(&self) -> &FxHashMap<ExprId, ScopeId> { | 78 | pub(crate) fn scope_by_expr(&self) -> &FxHashMap<ExprId, ScopeId> { |