diff options
| author | bors <bors@rust-lang.org> | 2025-02-06 20:56:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-02-06 20:56:48 +0000 |
| commit | 38213856a8a3a6d49a234e0d95a722a4f28a2b18 (patch) | |
| tree | ee486aab46d9b430698ffcc3d2e71fe1ce83bf5b /src | |
| parent | 0277061b9a4096437b9b35f471c915e1cbe3128f (diff) | |
| parent | bf24cade3ef2aae66a5047f762d66b70d2b4b92f (diff) | |
Auto merge of #136650 - cuviper:beta-next, r=cuviper
[beta] backports - Ensure that we don't try to access fields on a non-struct pattern type #135222 - Do not include GCC source code in source tarballs #135658 - Temporarily bring back `Rvalue::Len` #135709 - Add a couple of missing `ensure_sufficient_stacks` #136352 - Enable kernel sanitizers for aarch64-unknown-none-softfloat #135905 r? cuviper
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/src/core/build_steps/dist.rs | 13 | ||||
| -rw-r--r-- | src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs index aa664998f97..34e6a1e1d35 100644 --- a/src/bootstrap/src/core/build_steps/dist.rs +++ b/src/bootstrap/src/core/build_steps/dist.rs @@ -995,7 +995,18 @@ impl Step for PlainSourceTarball { ]; let src_dirs = ["src", "compiler", "library", "tests"]; - copy_src_dirs(builder, &builder.src, &src_dirs, &[], plain_dst_src); + copy_src_dirs( + builder, + &builder.src, + &src_dirs, + &[ + // We don't currently use the GCC source code for building any official components, + // it is very big, and has unclear licensing implications due to being GPL licensed. + // We thus exclude it from the source tarball from now. + "src/gcc", + ], + plain_dst_src, + ); // Copy the files normally for item in &src_files { diff --git a/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs b/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs index 428b40c5771..104ae154e36 100644 --- a/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs +++ b/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs @@ -109,7 +109,7 @@ fn check_rvalue<'tcx>( ) -> McfResult { match rvalue { Rvalue::ThreadLocalRef(_) => Err((span, "cannot access thread local storage in const fn".into())), - Rvalue::Discriminant(place) | Rvalue::Ref(_, _, place) | Rvalue::RawPtr(_, place) => { + Rvalue::Len(place) | Rvalue::Discriminant(place) | Rvalue::Ref(_, _, place) | Rvalue::RawPtr(_, place) => { check_place(tcx, *place, span, body, msrv) }, Rvalue::CopyForDeref(place) => check_place(tcx, *place, span, body, msrv), |