diff options
| author | bors <bors@rust-lang.org> | 2020-02-09 11:08:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-02-09 11:08:43 +0000 |
| commit | 2d9ef4e9f9363eb40064b8d2cc8f7743d8ecc873 (patch) | |
| tree | 938ff5943d8a734fdb5fb2aa964ff087dd62ce81 | |
| parent | 4ad6fb3fb044606ad21facc1b5c9c2d518453ad5 (diff) | |
| parent | 5328b5d6670a387a4c0f06404e476570ee739c63 (diff) | |
| download | rust-2d9ef4e9f9363eb40064b8d2cc8f7743d8ecc873.tar.gz rust-2d9ef4e9f9363eb40064b8d2cc8f7743d8ecc873.zip | |
Auto merge of #5149 - lzutao:rustup-65232, r=flip1995
Rustup "index ReEmpty by universe" cc https://github.com/rust-lang/rust/pull/65232 changelog: none
| -rw-r--r-- | clippy_lints/src/needless_pass_by_value.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/clippy_lints/src/needless_pass_by_value.rs b/clippy_lints/src/needless_pass_by_value.rs index b23e26b7558..0e844b92071 100644 --- a/clippy_lints/src/needless_pass_by_value.rs +++ b/clippy_lints/src/needless_pass_by_value.rs @@ -170,8 +170,9 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NeedlessPassByValue { ( preds.iter().any(|t| t.def_id() == borrow_trait), - !preds.is_empty() - && preds.iter().all(|t| { + !preds.is_empty() && { + let ty_empty_region = cx.tcx.mk_imm_ref(&RegionKind::ReEmpty(ty::UniverseIndex::ROOT), ty); + preds.iter().all(|t| { let ty_params = &t .skip_binder() .trait_ref @@ -180,8 +181,9 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NeedlessPassByValue { .skip(1) .cloned() .collect::<Vec<_>>(); - implements_trait(cx, cx.tcx.mk_imm_ref(&RegionKind::ReEmpty, ty), t.def_id(), ty_params) - }), + implements_trait(cx, ty_empty_region, t.def_id(), ty_params) + }) + }, ) }; |