Skip to content

Commit b07daae

Browse files
committed
Auto merge of #159966 - JonathanBrouwer:rollup-efqUEIj, r=JonathanBrouwer
Rollup of 28 pull requests Successful merges: - rust-lang/rust#159638 (bootstrap: Split the `Step` trait into multiple traits) - rust-lang/rust#159774 (rustc_trait_selection: fix trait solver hang caused by degenerate obligations) - rust-lang/rust#159837 (line-tables-only test: check that the line number matches the function name) - rust-lang/rust#159946 (Update Enzyme submodule to imporve llvm-cov) - rust-lang/rust#159962 (miri subtree update) - rust-lang/rust#156570 (tests: extend remap-path-prefix-std to all stdlib rlibs) - rust-lang/rust#159617 (Fix up `#[linkage]` target checking) - rust-lang/rust#159633 (Improve workings of attribute suggestions) - rust-lang/rust#159733 (std: Switch implementations of `thread_local!` for WASI) - rust-lang/rust#159783 (Check unsafe impls on safe EIIs) - rust-lang/rust#159810 (Add tuple never coercion collection regression test) - rust-lang/rust#159826 (Remove redundant `#[rustc_paren_sugar]` feature gate) - rust-lang/rust#159846 (Implement `str::copy_from_str`) - rust-lang/rust#159849 (rustc_parse: Stop returning `Option` from statement parsing) - rust-lang/rust#159853 (Updated expect messages for `CString` struct and method documentation) - rust-lang/rust#159875 (More cleanup in `rustc_attr_parsing`) - rust-lang/rust#159882 (Update expect messages in library/alloc/boxed.rs and library/alloc/string.rs to follow the style guide) - rust-lang/rust#159891 (Split multiline derives into std/rustc macros) - rust-lang/rust#159893 (Fix `find_attr` hygiene and `rustc_hir` cleanups) - rust-lang/rust#159895 (rustc-dev-guide subtree update) - rust-lang/rust#159902 (Clarify that the expected runtime symbols signature is for the current target only) - rust-lang/rust#159914 (Fix error in diagnostic on_unmatched_args) - rust-lang/rust#159917 (spare capacity mut constification) - rust-lang/rust#159918 (rename abort_unwind → abort_on_unwind) - rust-lang/rust#159927 (Remove sve2 from the ImpliedFeatures of AArch64 v9a.) - rust-lang/rust#159936 (Minor `rustc_ast::ast` doc cleanups) - rust-lang/rust#159945 (Update expect messages in library/core/src/ptr/non_null.rs) - rust-lang/rust#159950 (Add CFI tests for return types and never type)
2 parents 602faa7 + 38b3ad3 commit b07daae

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

clippy_lints/src/lifetimes.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use rustc_ast::visit::{try_visit, walk_list};
77
use rustc_data_structures::fx::{FxHashSet, FxIndexMap, FxIndexSet};
88
use rustc_errors::Applicability;
99
use rustc_hir::FnRetTy::Return;
10-
use rustc_hir::intravisit::nested_filter::{self as hir_nested_filter, NestedFilter};
10+
use rustc_hir::intravisit::{IgnoreNested, NestedFilter};
1111
use rustc_hir::intravisit::{
1212
Visitor, VisitorExt, walk_fn_decl, walk_generic_args, walk_generic_param, walk_generics, walk_impl_item_ref,
1313
walk_param_bound, walk_poly_trait_ref, walk_trait_ref, walk_ty, walk_unambig_ty, walk_where_predicate,
@@ -714,7 +714,7 @@ fn report_extra_trait_object_lifetimes<'tcx>(
714714
generic_params: &'tcx [GenericParam<'_>],
715715
trait_ref: &'tcx TraitRef<'tcx>,
716716
) {
717-
let mut checker = LifetimeChecker::<hir_nested_filter::None>::new(cx, generic_params);
717+
let mut checker = LifetimeChecker::<IgnoreNested>::new(cx, generic_params);
718718

719719
for param in generic_params {
720720
walk_generic_param(&mut checker, param);
@@ -738,7 +738,7 @@ fn report_extra_trait_object_lifetimes<'tcx>(
738738
}
739739

740740
fn report_extra_lifetimes<'tcx>(cx: &LateContext<'tcx>, func: &'tcx FnDecl<'_>, generics: &'tcx Generics<'_>) {
741-
let mut checker = LifetimeChecker::<hir_nested_filter::None>::new(cx, generics.params);
741+
let mut checker = LifetimeChecker::<IgnoreNested>::new(cx, generics.params);
742742

743743
walk_generics(&mut checker, generics);
744744
walk_fn_decl(&mut checker, func);

clippy_lints/src/unnecessary_literal_bound.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ struct FindNonLiteralReturn;
8181

8282
impl<'hir> Visitor<'hir> for FindNonLiteralReturn {
8383
type Result = std::ops::ControlFlow<()>;
84-
type NestedFilter = intravisit::nested_filter::None;
84+
type NestedFilter = intravisit::IgnoreNested;
8585

8686
fn visit_expr(&mut self, expr: &'hir Expr<'hir>) -> Self::Result {
8787
if let ExprKind::Ret(Some(ret_val_expr)) = expr.kind

0 commit comments

Comments
 (0)