Rustup (#14721)

r? @ghost changelog: none

Author: flip1995

clippy_lints/src/dereference.rs

@@ -853,7 +853,7 @@ impl TyCoercionStability {
  continue;
  },
  ty::Param(_) if for_return => Self::Deref,
- ty::Alias(ty::Weak | ty::Inherent, _) => unreachable!("should have been normalized away above"),
+ ty::Alias(ty::Free | ty::Inherent, _) => unreachable!("should have been normalized away above"),
  ty::Alias(ty::Projection, _) if !for_return && ty.has_non_region_param() => Self::Reborrow,
  ty::Infer(_)
  | ty::Error(_)

clippy_lints/src/missing_const_for_fn.rs

@@ -197,7 +197,7 @@ fn fn_inputs_has_impl_trait_ty(cx: &LateContext<'_>, def_id: LocalDefId) -> bool
  inputs.iter().any(|input| {
  matches!(
  input.kind(),
- ty::Alias(ty::AliasTyKind::Weak, alias_ty) if cx.tcx.type_of(alias_ty.def_id).skip_binder().is_impl_trait()
+ ty::Alias(ty::AliasTyKind::Free, alias_ty) if cx.tcx.type_of(alias_ty.def_id).skip_binder().is_impl_trait()
  )
  })
 }

clippy_utils/README.md

@@ -8,7 +8,7 @@ This crate is only guaranteed to build with this `nightly` toolchain:
 
 <!-- begin autogenerated nightly -->
 ```
-nightly-2025-04-22
+nightly-2025-05-01
 ```
 <!-- end autogenerated nightly -->
 

clippy_utils/src/hir_utils.rs

@@ -1117,6 +1117,11 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
  self.hash_const_arg(s);
  self.hash_const_arg(e);
  },
+ TyPatKind::Or(variants) => {
+ for variant in variants {
+ self.hash_ty_pat(variant);
+ }
+ },
  TyPatKind::Err(_) => {},
  }
  }

clippy_utils/src/source.rs

@@ -142,6 +142,7 @@ pub trait SpanRangeExt: SpanRange {
  map_range(cx.sess().source_map(), self.into_range(), f)
  }
 
+ #[allow(rustdoc::invalid_rust_codeblocks, reason = "The codeblock is intentionally broken")]
  /// Extends the range to include all preceding whitespace characters, unless there
  /// are non-whitespace characters left on the same line after `self`.
  ///

rust-toolchain.toml

@@ -1,6 +1,6 @@
 [toolchain]
 # begin autogenerated nightly
-channel = "nightly-2025-04-22"
+channel = "nightly-2025-05-01"
 # end autogenerated nightly
 components = ["cargo", "llvm-tools", "rust-src", "rust-std", "rustc", "rustc-dev", "rustfmt"]
 profile = "minimal"

tests/ui/blocks_in_conditions.fixed

@@ -1,7 +1,12 @@
 //@aux-build:proc_macro_attr.rs
 
 #![warn(clippy::blocks_in_conditions)]
-#![allow(unused, clippy::needless_if, clippy::missing_transmute_annotations)]
+#![allow(
+ unused,
+ unnecessary_transmutes,
+ clippy::needless_if,
+ clippy::missing_transmute_annotations
+)]
 #![warn(clippy::nonminimal_bool)]
 
 macro_rules! blocky {

tests/ui/blocks_in_conditions.rs

@@ -1,7 +1,12 @@
 //@aux-build:proc_macro_attr.rs
 
 #![warn(clippy::blocks_in_conditions)]
-#![allow(unused, clippy::needless_if, clippy::missing_transmute_annotations)]
+#![allow(
+ unused,
+ unnecessary_transmutes,
+ clippy::needless_if,
+ clippy::missing_transmute_annotations
+)]
 #![warn(clippy::nonminimal_bool)]
 
 macro_rules! blocky {

tests/ui/blocks_in_conditions.stderr

@@ -1,5 +1,5 @@
 error: in an `if` condition, avoid complex blocks or closures with blocks; instead, move the block or closure higher and bind it with a `let`
- --> tests/ui/blocks_in_conditions.rs:25:5
+ --> tests/ui/blocks_in_conditions.rs:30:5
  |
 LL | / if {
 LL | |
@@ -20,13 +20,13 @@ LL ~ }; if res {
  |
 
 error: omit braces around single expression condition
- --> tests/ui/blocks_in_conditions.rs:37:8
+ --> tests/ui/blocks_in_conditions.rs:42:8
  |
 LL | if { true } { 6 } else { 10 }
  | ^^^^^^^^ help: try: `true`
 
 error: this boolean expression can be simplified
- --> tests/ui/blocks_in_conditions.rs:43:8
+ --> tests/ui/blocks_in_conditions.rs:48:8
  |
 LL | if true && x == 3 { 6 } else { 10 }
  | ^^^^^^^^^^^^^^ help: try: `x == 3`

tests/ui/checked_unwrap/simple_conditionals.stderr

@@ -236,7 +236,7 @@ LL | if result.is_ok() {
 LL | result.as_mut().unwrap();
  | ^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: creating a shared reference to mutable static is discouraged
+error: creating a shared reference to mutable static
  --> tests/ui/checked_unwrap/simple_conditionals.rs:183:12
  |
 LL | if X.is_some() {