Auto merge of #131205 - flip1995:clippy-subtree-update, r=Manishearth

Clippy subtree update
r? `@Manishearth`

Author: bors

src/tools/clippy/.github/workflows/remark.yml

@@ -19,7 +19,7 @@ jobs:
 uses: actions/checkout@v4
 
  - name: Setup Node.js
-uses: actions/setup-node@v3
+uses: actions/setup-node@v4
 with:
 node-version: '18.x'
 

src/tools/clippy/CHANGELOG.md

@@ -5871,6 +5871,7 @@ Released 2018-09-13
 [`ref_as_ptr`]: https://rust-lang.github.io/rust-clippy/master/index.html#ref_as_ptr
 [`ref_binding_to_reference`]: https://rust-lang.github.io/rust-clippy/master/index.html#ref_binding_to_reference
 [`ref_in_deref`]: https://rust-lang.github.io/rust-clippy/master/index.html#ref_in_deref
+[`ref_option`]: https://rust-lang.github.io/rust-clippy/master/index.html#ref_option
 [`ref_option_ref`]: https://rust-lang.github.io/rust-clippy/master/index.html#ref_option_ref
 [`ref_patterns`]: https://rust-lang.github.io/rust-clippy/master/index.html#ref_patterns
 [`regex_macro`]: https://rust-lang.github.io/rust-clippy/master/index.html#regex_macro

src/tools/clippy/book/src/lint_configuration.md

@@ -353,6 +353,7 @@ Suppress lints whenever the suggested change would cause breakage for other crat
 *[`rc_buffer`](https://rust-lang.github.io/rust-clippy/master/index.html#rc_buffer)
 *[`rc_mutex`](https://rust-lang.github.io/rust-clippy/master/index.html#rc_mutex)
 *[`redundant_allocation`](https://rust-lang.github.io/rust-clippy/master/index.html#redundant_allocation)
+*[`ref_option`](https://rust-lang.github.io/rust-clippy/master/index.html#ref_option)
 *[`single_call_fn`](https://rust-lang.github.io/rust-clippy/master/index.html#single_call_fn)
 *[`trivially_copy_pass_by_ref`](https://rust-lang.github.io/rust-clippy/master/index.html#trivially_copy_pass_by_ref)
 *[`unnecessary_box_returns`](https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_box_returns)

src/tools/clippy/clippy_config/src/conf.rs

@@ -378,6 +378,7 @@ define_Conf! {
  rc_buffer,
  rc_mutex,
  redundant_allocation,
+ ref_option,
  single_call_fn,
  trivially_copy_pass_by_ref,
  unnecessary_box_returns,

src/tools/clippy/clippy_config/src/msrvs.rs

@@ -19,6 +19,7 @@ macro_rules! msrv_aliases {
 msrv_aliases!{
 1,83,0{CONST_EXTERN_FN}
 1,83,0{CONST_FLOAT_BITS_CONV}
+1,82,0{IS_NONE_OR}
 1,81,0{LINT_REASONS_STABILIZATION}
 1,80,0{BOX_INTO_ITER}
 1,77,0{C_STR_LITERALS}

src/tools/clippy/clippy_lints/src/booleans.rs

@@ -1,3 +1,5 @@
+use clippy_config::Conf;
+use clippy_config::msrvs::{self,Msrv};
 use clippy_utils::diagnostics::{span_lint_and_sugg, span_lint_hir_and_then};
 use clippy_utils::eq_expr_value;
 use clippy_utils::source::SpanRangeExt;
@@ -7,7 +9,7 @@ use rustc_errors::Applicability;
 use rustc_hir::intravisit::{FnKind,Visitor, walk_expr};
 use rustc_hir::{BinOpKind,Body,Expr,ExprKind,FnDecl,UnOp};
 use rustc_lint::{LateContext,LateLintPass,Level};
-use rustc_session::declare_lint_pass;
+use rustc_session::{RustcVersion, impl_lint_pass};
 use rustc_span::def_id::LocalDefId;
 use rustc_span::{Span, sym};
 
@@ -69,9 +71,25 @@ declare_clippy_lint! {
 }
 
 // For each pairs, both orders are considered.
-constMETHODS_WITH_NEGATION:[(&str,&str);2] = [("is_some","is_none"),("is_err","is_ok")];
+constMETHODS_WITH_NEGATION:[(Option<RustcVersion>,&str,&str);3] = [
+(None,"is_some","is_none"),
+(None,"is_err","is_ok"),
+(Some(msrvs::IS_NONE_OR),"is_some_and","is_none_or"),
+];
+
+pubstructNonminimalBool{
+msrv:Msrv,
+}
+
+implNonminimalBool{
+pubfnnew(conf:&'staticConf) -> Self{
+Self{
+msrv: conf.msrv.clone(),
+}
+}
+}
 
-declare_lint_pass!(NonminimalBool => [NONMINIMAL_BOOL,OVERLY_COMPLEX_BOOL_EXPR]);
+impl_lint_pass!(NonminimalBool => [NONMINIMAL_BOOL,OVERLY_COMPLEX_BOOL_EXPR]);
 
 impl<'tcx>LateLintPass<'tcx>forNonminimalBool{
 fncheck_fn(
@@ -83,7 +101,7 @@ impl<'tcx> LateLintPass<'tcx> for NonminimalBool {
  _:Span,
  _:LocalDefId,
 ){
-NonminimalBoolVisitor{ cx }.visit_body(body);
+NonminimalBoolVisitor{ cx,msrv:&self.msrv}.visit_body(body);
 }
 
 fncheck_expr(&mutself,cx:&LateContext<'tcx>,expr:&'tcxExpr<'tcx>){
@@ -100,6 +118,8 @@ impl<'tcx> LateLintPass<'tcx> for NonminimalBool {
  _ => {},
 }
 }
+
+extract_msrv_attr!(LateContext);
 }
 
 fninverted_bin_op_eq_str(op:BinOpKind) -> Option<&'staticstr>{
@@ -176,11 +196,11 @@ fn check_inverted_bool_in_condition(
 );
 }
 
-fncheck_simplify_not(cx:&LateContext<'_>,expr:&Expr<'_>){
+fncheck_simplify_not(cx:&LateContext<'_>,msrv:&Msrv,expr:&Expr<'_>){
 ifletExprKind::Unary(UnOp::Not, inner) = &expr.kind
  && !expr.span.from_expansion()
  && !inner.span.from_expansion()
- && letSome(suggestion) = simplify_not(cx, inner)
+ && letSome(suggestion) = simplify_not(cx,msrv,inner)
  && cx.tcx.lint_level_at_node(NONMINIMAL_BOOL, expr.hir_id).0 != Level::Allow
 {
 span_lint_and_sugg(
@@ -197,6 +217,7 @@ fn check_simplify_not(cx: &LateContext<'_>, expr: &Expr<'_>) {
 
 structNonminimalBoolVisitor<'a,'tcx>{
 cx:&'aLateContext<'tcx>,
+msrv:&'aMsrv,
 }
 
 use quine_mc_cluskey::Bool;
@@ -205,7 +226,7 @@ struct Hir2Qmm<'a, 'tcx, 'v> {
 cx:&'aLateContext<'tcx>,
 }
 
-impl<'a,'tcx,'v>Hir2Qmm<'a,'tcx,'v>{
+impl<'v>Hir2Qmm<'_,'_,'v>{
 fnextract(&mutself,op:BinOpKind,a:&[&'vExpr<'_>],mutv:Vec<Bool>) -> Result<Vec<Bool>,String>{
 for a in a {
 ifletExprKind::Binary(binop, lhs, rhs) = &a.kind{
@@ -289,10 +310,11 @@ impl<'a, 'tcx, 'v> Hir2Qmm<'a, 'tcx, 'v> {
 structSuggestContext<'a,'tcx,'v>{
 terminals:&'v[&'vExpr<'v>],
 cx:&'aLateContext<'tcx>,
+msrv:&'aMsrv,
 output:String,
 }
 
-impl<'a,'tcx,'v>SuggestContext<'a,'tcx,'v>{
+implSuggestContext<'_,'_,'_>{
 fnrecurse(&mutself,suggestion:&Bool) -> Option<()>{
 use quine_mc_cluskey::Bool::{And,False,Not,Or,Term,True};
 match suggestion {
@@ -311,7 +333,7 @@ impl<'a, 'tcx, 'v> SuggestContext<'a, 'tcx, 'v> {
 },
 Term(n) => {
 let terminal = self.terminals[n asusize];
-ifletSome(str) = simplify_not(self.cx, terminal){
+ifletSome(str) = simplify_not(self.cx,self.msrv,terminal){
 self.output.push_str(&str);
 }else{
 self.output.push('!');
@@ -358,7 +380,7 @@ impl<'a, 'tcx, 'v> SuggestContext<'a, 'tcx, 'v> {
 }
 }
 
-fnsimplify_not(cx:&LateContext<'_>,expr:&Expr<'_>) -> Option<String>{
+fnsimplify_not(cx:&LateContext<'_>,curr_msrv:&Msrv,expr:&Expr<'_>) -> Option<String>{
 match&expr.kind{
 ExprKind::Binary(binop, lhs, rhs) => {
 if !implements_ord(cx, lhs){
@@ -389,7 +411,7 @@ fn simplify_not(cx: &LateContext<'_>, expr: &Expr<'_>) -> Option<String> {
 Some(format!("{lhs_snippet}{op}{rhs_snippet}"))
 })
 },
-ExprKind::MethodCall(path, receiver,[], _) => {
+ExprKind::MethodCall(path, receiver,args, _) => {
 let type_of_receiver = cx.typeck_results().expr_ty(receiver);
 if !is_type_diagnostic_item(cx, type_of_receiver, sym::Option)
  && !is_type_diagnostic_item(cx, type_of_receiver, sym::Result)
@@ -399,21 +421,41 @@ fn simplify_not(cx: &LateContext<'_>, expr: &Expr<'_>) -> Option<String> {
 METHODS_WITH_NEGATION
 .iter()
 .copied()
-.flat_map(|(a, b)| vec![(a, b),(b, a)])
-.find(|&(a, _)| {
-let path:&str = path.ident.name.as_str();
- a == path
+.flat_map(|(msrv, a, b)| vec![(msrv, a, b),(msrv, b, a)])
+.find(|&(msrv, a, _)| msrv.is_none_or(|msrv| curr_msrv.meets(msrv)) && a == path.ident.name.as_str())
+.and_then(|(_, _, neg_method)| {
+let negated_args = args
+.iter()
+.map(|arg| simplify_not(cx, curr_msrv, arg))
+.collect::<Option<Vec<_>>>()?
+.join(", ");
+Some(format!(
+"{}.{neg_method}({negated_args})",
+ receiver.span.get_source_text(cx)?
+))
 })
-.and_then(|(_, neg_method)| Some(format!("{}.{neg_method}()", receiver.span.get_source_text(cx)?)))
 },
+ExprKind::Closure(closure) => {
+let body = cx.tcx.hir().body(closure.body);
+let params = body
+.params
+.iter()
+.map(|param| param.span.get_source_text(cx).map(|t| t.to_string()))
+.collect::<Option<Vec<_>>>()?
+.join(", ");
+let negated = simplify_not(cx, curr_msrv, body.value)?;
+Some(format!("|{params}| {negated}"))
+},
+ExprKind::Unary(UnOp::Not, expr) => expr.span.get_source_text(cx).map(|t| t.to_string()),
  _ => None,
 }
 }
 
-fnsuggest(cx:&LateContext<'_>,suggestion:&Bool,terminals:&[&Expr<'_>]) -> String{
+fnsuggest(cx:&LateContext<'_>,msrv:&Msrv,suggestion:&Bool,terminals:&[&Expr<'_>]) -> String{
 letmut suggest_context = SuggestContext{
  terminals,
  cx,
+ msrv,
 output:String::new(),
 };
  suggest_context.recurse(suggestion);
@@ -475,7 +517,7 @@ fn terminal_stats(b: &Bool) -> Stats {
  stats
 }
 
-impl<'a,'tcx>NonminimalBoolVisitor<'a,'tcx>{
+impl<'tcx>NonminimalBoolVisitor<'_,'tcx>{
 fnbool_expr(&self,e:&'tcxExpr<'_>){
 letmut h2q = Hir2Qmm{
 terminals:Vec::new(),
@@ -526,7 +568,7 @@ impl<'a, 'tcx> NonminimalBoolVisitor<'a, 'tcx> {
  diag.span_suggestion(
  e.span,
 "it would look like the following",
-suggest(self.cx, suggestion,&h2q.terminals),
+suggest(self.cx,self.msrv,suggestion,&h2q.terminals),
 // nonminimal_bool can produce minimal but
 // not human readable expressions (#3141)
 Applicability::Unspecified,
@@ -569,20 +611,20 @@ impl<'a, 'tcx> NonminimalBoolVisitor<'a, 'tcx> {
 }
 };
 if improvements.is_empty(){
-check_simplify_not(self.cx, e);
+check_simplify_not(self.cx,self.msrv,e);
 }else{
 nonminimal_bool_lint(
  improvements
 .into_iter()
-.map(|suggestion| suggest(self.cx, suggestion,&h2q.terminals))
+.map(|suggestion| suggest(self.cx,self.msrv,suggestion,&h2q.terminals))
 .collect(),
 );
 }
 }
 }
 }
 
-impl<'a,'tcx>Visitor<'tcx>forNonminimalBoolVisitor<'a,'tcx>{
+impl<'tcx>Visitor<'tcx>forNonminimalBoolVisitor<'_,'tcx>{
 fnvisit_expr(&mutself,e:&'tcxExpr<'_>){
 if !e.span.from_expansion(){
 match&e.kind{

src/tools/clippy/clippy_lints/src/box_default.rs

@@ -91,7 +91,7 @@ fn is_local_vec_expn(cx: &LateContext<'_>, expr: &Expr<'_>, ref_expr: &Expr<'_>)
 #[derive(Default)]
 structInferVisitor(bool);
 
-impl<'tcx>Visitor<'tcx>forInferVisitor{
+implVisitor<'_>forInferVisitor{
 fnvisit_ty(&mutself,t:&Ty<'_>){
 self.0 |= matches!(t.kind,TyKind::Infer | TyKind::OpaqueDef(..) | TyKind::TraitObject(..));
 if !self.0{

src/tools/clippy/clippy_lints/src/cargo/common_metadata.rs

@@ -10,27 +10,27 @@ pub(super) fn check(cx: &LateContext<'_>, metadata: &Metadata, ignore_publish: b
 // only run the lint if publish is `None` (`publish = true` or skipped entirely)
 // or if the vector isn't empty (`publish = ["something"]`)
 if package.publish.as_ref().filter(|publish| publish.is_empty()).is_none() || ignore_publish {
-ifis_empty_str(&package.description){
+ifis_empty_str(package.description.as_ref()){
 missing_warning(cx, package,"package.description");
 }
 
-ifis_empty_str(&package.license) && is_empty_str(&package.license_file){
+ifis_empty_str(package.license.as_ref()) && is_empty_str(package.license_file.as_ref()){
 missing_warning(cx, package,"either package.license or package.license_file");
 }
 
-ifis_empty_str(&package.repository){
+ifis_empty_str(package.repository.as_ref()){
 missing_warning(cx, package,"package.repository");
 }
 
-ifis_empty_str(&package.readme){
+ifis_empty_str(package.readme.as_ref()){
 missing_warning(cx, package,"package.readme");
 }
 
-ifis_empty_vec(&package.keywords){
+ifis_empty_vec(package.keywords.as_ref()){
 missing_warning(cx, package,"package.keywords");
 }
 
-ifis_empty_vec(&package.categories){
+ifis_empty_vec(package.categories.as_ref()){
 missing_warning(cx, package,"package.categories");
 }
 }
@@ -42,8 +42,8 @@ fn missing_warning(cx: &LateContext<'_>, package: &cargo_metadata::Package, fiel
 span_lint(cx,CARGO_COMMON_METADATA,DUMMY_SP, message);
 }
 
-fnis_empty_str<T:AsRef<std::ffi::OsStr>>(value:&Option<T>) -> bool{
- value.as_ref().map_or(true, |s| s.as_ref().is_empty())
+fnis_empty_str<T:AsRef<std::ffi::OsStr>>(value:Option<&T>) -> bool{
+ value.map_or(true, |s| s.as_ref().is_empty())
 }
 
 fnis_empty_vec(value:&[String]) -> bool{

src/tools/clippy/clippy_lints/src/casts/borrow_as_ptr.rs

@@ -1,6 +1,6 @@
 use clippy_utils::diagnostics::span_lint_and_sugg;
-use clippy_utils::is_no_std_crate;
 use clippy_utils::source::snippet_with_context;
+use clippy_utils::std_or_core;
 use rustc_errors::Applicability;
 use rustc_hir::{BorrowKind,Expr,ExprKind,Mutability,Ty,TyKind};
 use rustc_lint::LateContext;
@@ -16,8 +16,8 @@ pub(super) fn check<'tcx>(
 ){
 ifmatches!(cast_to.kind,TyKind::Ptr(_))
  && letExprKind::AddrOf(BorrowKind::Ref, mutability, e) = cast_expr.kind
+ && letSome(std_or_core) = std_or_core(cx)
 {
-let core_or_std = ifis_no_std_crate(cx){"core"}else{"std"};
 let macro_name = match mutability {
 Mutability::Not => "addr_of",
 Mutability::Mut => "addr_of_mut",
@@ -40,7 +40,7 @@ pub(super) fn check<'tcx>(
  expr.span,
 "borrow as raw pointer",
 "try",
-format!("{core_or_std}::ptr::{macro_name}!({snip})"),
+format!("{std_or_core}::ptr::{macro_name}!({snip})"),
 Applicability::MachineApplicable,
 );
 }

src/tools/clippy/clippy_lints/src/casts/ref_as_ptr.rs

@@ -1,7 +1,7 @@
 use clippy_utils::diagnostics::span_lint_and_sugg;
 use clippy_utils::source::snippet_with_applicability;
 use clippy_utils::sugg::Sugg;
-use clippy_utils::{ExprUseNode, expr_use_ctxt,is_no_std_crate};
+use clippy_utils::{ExprUseNode, expr_use_ctxt,std_or_core};
 use rustc_errors::Applicability;
 use rustc_hir::{Expr,Mutability,Ty,TyKind};
 use rustc_lint::LateContext;
@@ -25,8 +25,8 @@ pub(super) fn check<'tcx>(
  && let use_cx = expr_use_ctxt(cx, expr)
 // TODO: only block the lint if `cast_expr` is a temporary
  && !matches!(use_cx.use_node(cx),ExprUseNode::LetStmt(_) | ExprUseNode::ConstStatic(_))
+ && letSome(std_or_core) = std_or_core(cx)
 {
-let core_or_std = ifis_no_std_crate(cx){"core"}else{"std"};
 let fn_name = match to_mutbl {
 Mutability::Not => "from_ref",
 Mutability::Mut => "from_mut",
@@ -56,7 +56,7 @@ pub(super) fn check<'tcx>(
  expr.span,
 "reference as raw pointer",
 "try",
-format!("{core_or_std}::ptr::{fn_name}{turbofish}({cast_expr_sugg})"),
+format!("{std_or_core}::ptr::{fn_name}{turbofish}({cast_expr_sugg})"),
  app,
 );
 }