diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2020-07-02 15:55:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-02 15:55:55 -0700 |
| commit | d6bfca2ccf39ccb3d17cf89e23154c4e39695534 (patch) | |
| tree | 88945cd22b938a969432b9fb12981268c30ec276 /src/test | |
| parent | 2d83cbb8b68d6a83a9f0559d89904a6a1e0bb9e3 (diff) | |
| parent | 874f406ffdda1533cbbc04bc8fd48e7d9da59c47 (diff) | |
| download | rust-d6bfca2ccf39ccb3d17cf89e23154c4e39695534.tar.gz rust-d6bfca2ccf39ccb3d17cf89e23154c4e39695534.zip | |
Rollup merge of #73753 - eddyb:extraneous-lifetime, r=Manishearth
Use 'tcx for references to AccessLevels wherever possible. Most of the changes are just fallout from removing a lifetime parameter from structs, and mostly in clippy. r? @Manishearth
Diffstat (limited to 'src/test')
4 files changed, 5 insertions, 5 deletions
diff --git a/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs b/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs index 1b6a38acb1c..9ba26754778 100644 --- a/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs +++ b/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs @@ -33,10 +33,10 @@ declare_lint! { declare_lint_pass!(MissingWhitelistedAttrPass => [MISSING_WHITELISTED_ATTR]); -impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingWhitelistedAttrPass { +impl<'tcx> LateLintPass<'tcx> for MissingWhitelistedAttrPass { fn check_fn( &mut self, - cx: &LateContext<'a, 'tcx>, + cx: &LateContext<'tcx>, _: intravisit::FnKind<'tcx>, _: &'tcx hir::FnDecl, _: &'tcx hir::Body, diff --git a/src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs b/src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs index f8cb1640cb4..bfb4da4c8f5 100644 --- a/src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs +++ b/src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs @@ -26,7 +26,7 @@ macro_rules! fake_lint_pass { } } - impl<'a, 'tcx> LateLintPass<'a, 'tcx> for $struct { + impl LateLintPass<'_> for $struct { fn check_crate(&mut self, cx: &LateContext, krate: &rustc_hir::Crate) { $( if !attr::contains_name(&krate.item.attrs, $attr) { diff --git a/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs b/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs index 6978d02c09d..e6a6f73bd47 100644 --- a/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs +++ b/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs @@ -25,7 +25,7 @@ declare_lint! { declare_lint_pass!(Pass => [CRATE_NOT_OKAY]); -impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass { +impl<'tcx> LateLintPass<'tcx> for Pass { fn check_crate(&mut self, cx: &LateContext, krate: &rustc_hir::Crate) { if !attr::contains_name(&krate.item.attrs, Symbol::intern("crate_okay")) { cx.lint(CRATE_NOT_OKAY, |lint| { diff --git a/src/test/ui-fulldeps/auxiliary/lint-group-plugin-test.rs b/src/test/ui-fulldeps/auxiliary/lint-group-plugin-test.rs index 5a8eaa63db2..02216b33dc3 100644 --- a/src/test/ui-fulldeps/auxiliary/lint-group-plugin-test.rs +++ b/src/test/ui-fulldeps/auxiliary/lint-group-plugin-test.rs @@ -20,7 +20,7 @@ declare_lint!(PLEASE_LINT, Warn, "Warn about items named 'pleaselintme'"); declare_lint_pass!(Pass => [TEST_LINT, PLEASE_LINT]); -impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass { +impl<'tcx> LateLintPass<'tcx> for Pass { fn check_item(&mut self, cx: &LateContext, it: &rustc_hir::Item) { match &*it.ident.as_str() { "lintme" => cx.lint(TEST_LINT, |lint| { |