From a175e8d90312a113869d366ba7dde0742df7f5e2 Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Mon, 20 Jan 2025 17:38:17 +0100
Subject: [PATCH 1/7] CI: free disk on linux arm runner
---
src/ci/github-actions/jobs.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 799ea3e9ad2df..ecd8642d76674 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -44,6 +44,8 @@ runners:
<<: *base-job
- &job-aarch64-linux
+ # Free some disk space to avoid running out of space during the build.
+ free_disk: true
os: ubuntu-22.04-arm
envs:
From cd9dcfc6bc9ef6ceb97f24b47634bb44b9aaf39f Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Tue, 21 Jan 2025 11:42:56 +0100
Subject: [PATCH 2/7] ci: use ghcr buildkit image
---
src/ci/docker/run.sh | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh
index d1bc0519bc1eb..d2697ac27ab7a 100755
--- a/src/ci/docker/run.sh
+++ b/src/ci/docker/run.sh
@@ -123,6 +123,7 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
build_args+=("--build-arg" "SCRIPT_ARG=${DOCKER_SCRIPT}")
fi
+ GHCR_BUILDKIT_IMAGE="ghcr.io/rust-lang/buildkit:buildx-stable-1"
# On non-CI jobs, we try to download a pre-built image from the rust-lang-ci
# ghcr.io registry. If it is not possible, we fall back to building the image
# locally.
@@ -140,7 +141,9 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
elif [[ "$PR_CI_JOB" == "1" ]];
then
# Enable a new Docker driver so that --cache-from works with a registry backend
- docker buildx create --use --driver docker-container
+ # Use a custom image to avoid DockerHub rate limits
+ docker buildx create --use --driver docker-container \
+ --driver-opt image=${GHCR_BUILDKIT_IMAGE}
# Build the image using registry caching backend
retry docker \
@@ -156,7 +159,9 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
--password-stdin
# Enable a new Docker driver so that --cache-from/to works with a registry backend
- docker buildx create --use --driver docker-container
+ # Use a custom image to avoid DockerHub rate limits
+ docker buildx create --use --driver docker-container \
+ --driver-opt image=${GHCR_BUILDKIT_IMAGE}
# Build the image using registry caching backend
retry docker \
From ece8b0c94fae7124696f8a613538e333cd1b0b71 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge.aparicio@ferrous-systems.com>
Date: Tue, 21 Jan 2025 14:36:33 +0100
Subject: [PATCH 3/7] make UI tests that use `--test` work on panic=abort
targets
by adding `-Zpanic_abort_test`, which is a no-op on panic=unwind targets
fixes #135819
---
...ert-with-custom-errors-does-not-create-unnecessary-code.rs | 4 +++-
.../feature-gate-generic_assert.rs | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/tests/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs b/tests/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs
index 37d94830db2cf..2a27164f9cba2 100644
--- a/tests/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs
+++ b/tests/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs
@@ -1,4 +1,6 @@
-//@ compile-flags: --test
+// -Zpanic_abort_tests makes this test work on panic=abort targets and
+// it's a no-op on panic=unwind targets
+//@ compile-flags: --test -Zpanic_abort_tests
//@ run-pass
#![feature(core_intrinsics, generic_assert)]
diff --git a/tests/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs b/tests/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs
index 86cc7adb90de6..254d59076e531 100644
--- a/tests/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs
+++ b/tests/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs
@@ -1,4 +1,6 @@
-//@ compile-flags: --test
+// -Zpanic_abort_tests makes this test work on panic=abort targets and
+// it's a no-op on panic=unwind targets
+//@ compile-flags: --test -Zpanic_abort_tests
// ignore-tidy-linelength
//@ run-pass
From fed5f98c47e64bc5e96679165d16e5eec8b4917e Mon Sep 17 00:00:00 2001
From: Chris Denton <chris@chrisdenton.dev>
Date: Tue, 21 Jan 2025 17:27:24 +0000
Subject: [PATCH 4/7] Remove test panic from File::open
---
library/std/src/sys/pal/windows/fs.rs | 3 ---
1 file changed, 3 deletions(-)
diff --git a/library/std/src/sys/pal/windows/fs.rs b/library/std/src/sys/pal/windows/fs.rs
index b3659351b8c11..f8493c21ad444 100644
--- a/library/std/src/sys/pal/windows/fs.rs
+++ b/library/std/src/sys/pal/windows/fs.rs
@@ -328,9 +328,6 @@ impl File {
mem::size_of::<c::FILE_ALLOCATION_INFO>() as u32,
);
if result == 0 {
- if api::get_last_error().code != 0 {
- panic!("FILE_ALLOCATION_INFO failed!!!");
- }
let eof = c::FILE_END_OF_FILE_INFO { EndOfFile: 0 };
let result = c::SetFileInformationByHandle(
handle.as_raw_handle(),
From 922e6bb2d4a5828cc12499c4f3dca685c3fd9002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Esteban=20K=C3=BCber?= <esteban@kuber.com.ar>
Date: Mon, 20 Jan 2025 19:42:41 +0000
Subject: [PATCH 5/7] Detect missing fields with default values and suggest
`..`
When a struct definition has default field values, and the use struct ctor has missing field, if all those missing fields have defaults suggest `..`:
```
error[E0063]: missing fields `field1` and `field2` in initializer of `S`
--> $DIR/non-exhaustive-ctor.rs:16:13
|
LL | let _ = S { field: () };
| ^ missing `field1` and `field2`
|
help: all remaining fields have defaults, use `..`
|
LL | let _ = S { field: (), .. };
| ++++
```
---
compiler/rustc_hir_typeck/src/expr.rs | 30 +++++++
.../non-exhaustive-ctor.disabled.stderr | 86 +++++++++++++++++++
.../non-exhaustive-ctor.enabled.fixed | 28 ++++++
.../non-exhaustive-ctor.enabled.stderr | 25 ++++++
.../non-exhaustive-ctor.rs | 28 ++++++
5 files changed, 197 insertions(+)
create mode 100644 tests/ui/structs/default-field-values/non-exhaustive-ctor.disabled.stderr
create mode 100644 tests/ui/structs/default-field-values/non-exhaustive-ctor.enabled.fixed
create mode 100644 tests/ui/structs/default-field-values/non-exhaustive-ctor.enabled.stderr
create mode 100644 tests/ui/structs/default-field-values/non-exhaustive-ctor.rs
diff --git a/compiler/rustc_hir_typeck/src/expr.rs b/compiler/rustc_hir_typeck/src/expr.rs
index 01fed72d5a270..bdd436302f489 100644
--- a/compiler/rustc_hir_typeck/src/expr.rs
+++ b/compiler/rustc_hir_typeck/src/expr.rs
@@ -2349,6 +2349,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
self.report_missing_fields(
adt_ty,
path_span,
+ expr.span,
remaining_fields,
variant,
hir_fields,
@@ -2386,6 +2387,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
&self,
adt_ty: Ty<'tcx>,
span: Span,
+ full_span: Span,
remaining_fields: UnordMap<Ident, (FieldIdx, &ty::FieldDef)>,
variant: &'tcx ty::VariantDef,
hir_fields: &'tcx [hir::ExprField<'tcx>],
@@ -2425,6 +2427,34 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
);
err.span_label(span, format!("missing {remaining_fields_names}{truncated_fields_error}"));
+ if remaining_fields.items().all(|(_, (_, field))| field.value.is_some())
+ && self.tcx.sess.is_nightly_build()
+ {
+ let msg = format!(
+ "all remaining fields have default values, {you_can} use those values with `..`",
+ you_can = if self.tcx.features().default_field_values() {
+ "you can"
+ } else {
+ "if you added `#![feature(default_field_values)]` to your crate you could"
+ },
+ );
+ if let Some(hir_field) = hir_fields.last() {
+ err.span_suggestion_verbose(
+ hir_field.span.shrink_to_hi(),
+ msg,
+ ", ..".to_string(),
+ Applicability::MachineApplicable,
+ );
+ } else if hir_fields.is_empty() {
+ err.span_suggestion_verbose(
+ span.shrink_to_hi().with_hi(full_span.hi()),
+ msg,
+ " { .. }".to_string(),
+ Applicability::MachineApplicable,
+ );
+ }
+ }
+
if let Some(hir_field) = hir_fields.last() {
self.suggest_fru_from_range_and_emit(hir_field, variant, args, err);
} else {
diff --git a/tests/ui/structs/default-field-values/non-exhaustive-ctor.disabled.stderr b/tests/ui/structs/default-field-values/non-exhaustive-ctor.disabled.stderr
new file mode 100644
index 0000000000000..6379342565705
--- /dev/null
+++ b/tests/ui/structs/default-field-values/non-exhaustive-ctor.disabled.stderr
@@ -0,0 +1,86 @@
+error[E0658]: default values on fields are experimental
+ --> $DIR/non-exhaustive-ctor.rs:9:22
+ |
+LL | pub field: () = (),
+ | ^^^^^
+ |
+ = note: see issue #132162 <https://github.com/rust-lang/rust/issues/132162> for more information
+ = help: add `#![feature(default_field_values)]` to the crate attributes to enable
+ = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
+
+error[E0658]: default values on fields are experimental
+ --> $DIR/non-exhaustive-ctor.rs:11:25
+ |
+LL | pub field1: Priv = Priv,
+ | ^^^^^^^
+ |
+ = note: see issue #132162 <https://github.com/rust-lang/rust/issues/132162> for more information
+ = help: add `#![feature(default_field_values)]` to the crate attributes to enable
+ = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
+
+error[E0658]: default values on fields are experimental
+ --> $DIR/non-exhaustive-ctor.rs:13:25
+ |
+LL | pub field2: Priv = Priv,
+ | ^^^^^^^
+ |
+ = note: see issue #132162 <https://github.com/rust-lang/rust/issues/132162> for more information
+ = help: add `#![feature(default_field_values)]` to the crate attributes to enable
+ = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
+
+error[E0797]: base expression required after `..`
+ --> $DIR/non-exhaustive-ctor.rs:20:19
+ |
+LL | let _ = S { .. }; // ok
+ | ^
+ |
+help: add `#![feature(default_field_values)]` to the crate attributes to enable default values on `struct` fields
+ |
+LL + #![feature(default_field_values)]
+ |
+help: add a base expression here
+ |
+LL | let _ = S { ../* expr */ }; // ok
+ | ++++++++++
+
+error[E0797]: base expression required after `..`
+ --> $DIR/non-exhaustive-ctor.rs:22:30
+ |
+LL | let _ = S { field: (), .. }; // ok
+ | ^
+ |
+help: add `#![feature(default_field_values)]` to the crate attributes to enable default values on `struct` fields
+ |
+LL + #![feature(default_field_values)]
+ |
+help: add a base expression here
+ |
+LL | let _ = S { field: (), ../* expr */ }; // ok
+ | ++++++++++
+
+error[E0063]: missing fields `field`, `field1` and `field2` in initializer of `S`
+ --> $DIR/non-exhaustive-ctor.rs:24:13
+ |
+LL | let _ = S { };
+ | ^ missing `field`, `field1` and `field2`
+ |
+help: all remaining fields have default values, if you added `#![feature(default_field_values)]` to your crate you could use those values with `..`
+ |
+LL | let _ = S { .. };
+ | ~~~~~~
+
+error[E0063]: missing fields `field1` and `field2` in initializer of `S`
+ --> $DIR/non-exhaustive-ctor.rs:26:13
+ |
+LL | let _ = S { field: () };
+ | ^ missing `field1` and `field2`
+ |
+help: all remaining fields have default values, if you added `#![feature(default_field_values)]` to your crate you could use those values with `..`
+ |
+LL | let _ = S { field: (), .. };
+ | ++++
+
+error: aborting due to 7 previous errors
+
+Some errors have detailed explanations: E0063, E0658, E0797.
+For more information about an error, try `rustc --explain E0063`.
diff --git a/tests/ui/structs/default-field-values/non-exhaustive-ctor.enabled.fixed b/tests/ui/structs/default-field-values/non-exhaustive-ctor.enabled.fixed
new file mode 100644
index 0000000000000..7a371f993e809
--- /dev/null
+++ b/tests/ui/structs/default-field-values/non-exhaustive-ctor.enabled.fixed
@@ -0,0 +1,28 @@
+//@ revisions: enabled disabled
+//@[enabled] run-rustfix
+#![allow(private_interfaces, dead_code)]
+#![cfg_attr(enabled, feature(default_field_values))]
+use m::S;
+
+mod m {
+ pub struct S {
+ pub field: () = (),
+ //[disabled]~^ ERROR default values on fields are experimental
+ pub field1: Priv = Priv,
+ //[disabled]~^ ERROR default values on fields are experimental
+ pub field2: Priv = Priv,
+ //[disabled]~^ ERROR default values on fields are experimental
+ }
+ struct Priv;
+}
+
+fn main() {
+ let _ = S { .. }; // ok
+ //[disabled]~^ ERROR base expression required after `..`
+ let _ = S { field: (), .. }; // ok
+ //[disabled]~^ ERROR base expression required after `..`
+ let _ = S { .. };
+ //~^ ERROR missing fields `field`, `field1` and `field2`
+ let _ = S { field: (), .. };
+ //~^ ERROR missing fields `field1` and `field2`
+}
diff --git a/tests/ui/structs/default-field-values/non-exhaustive-ctor.enabled.stderr b/tests/ui/structs/default-field-values/non-exhaustive-ctor.enabled.stderr
new file mode 100644
index 0000000000000..6d035ebdc4750
--- /dev/null
+++ b/tests/ui/structs/default-field-values/non-exhaustive-ctor.enabled.stderr
@@ -0,0 +1,25 @@
+error[E0063]: missing fields `field`, `field1` and `field2` in initializer of `S`
+ --> $DIR/non-exhaustive-ctor.rs:24:13
+ |
+LL | let _ = S { };
+ | ^ missing `field`, `field1` and `field2`
+ |
+help: all remaining fields have default values, you can use those values with `..`
+ |
+LL | let _ = S { .. };
+ | ~~~~~~
+
+error[E0063]: missing fields `field1` and `field2` in initializer of `S`
+ --> $DIR/non-exhaustive-ctor.rs:26:13
+ |
+LL | let _ = S { field: () };
+ | ^ missing `field1` and `field2`
+ |
+help: all remaining fields have default values, you can use those values with `..`
+ |
+LL | let _ = S { field: (), .. };
+ | ++++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0063`.
diff --git a/tests/ui/structs/default-field-values/non-exhaustive-ctor.rs b/tests/ui/structs/default-field-values/non-exhaustive-ctor.rs
new file mode 100644
index 0000000000000..b60b219f8bcf0
--- /dev/null
+++ b/tests/ui/structs/default-field-values/non-exhaustive-ctor.rs
@@ -0,0 +1,28 @@
+//@ revisions: enabled disabled
+//@[enabled] run-rustfix
+#![allow(private_interfaces, dead_code)]
+#![cfg_attr(enabled, feature(default_field_values))]
+use m::S;
+
+mod m {
+ pub struct S {
+ pub field: () = (),
+ //[disabled]~^ ERROR default values on fields are experimental
+ pub field1: Priv = Priv,
+ //[disabled]~^ ERROR default values on fields are experimental
+ pub field2: Priv = Priv,
+ //[disabled]~^ ERROR default values on fields are experimental
+ }
+ struct Priv;
+}
+
+fn main() {
+ let _ = S { .. }; // ok
+ //[disabled]~^ ERROR base expression required after `..`
+ let _ = S { field: (), .. }; // ok
+ //[disabled]~^ ERROR base expression required after `..`
+ let _ = S { };
+ //~^ ERROR missing fields `field`, `field1` and `field2`
+ let _ = S { field: () };
+ //~^ ERROR missing fields `field1` and `field2`
+}
From cc19dfa125e280545e6e599f1aaf27ffb0c55ffd Mon Sep 17 00:00:00 2001
From: Lukas Markeffsky <@>
Date: Wed, 22 Jan 2025 00:20:54 +0100
Subject: [PATCH 6/7] Add `AsyncFn*` to core prelude
---
library/core/src/prelude/common.rs | 3 +++
1 file changed, 3 insertions(+)
diff --git a/library/core/src/prelude/common.rs b/library/core/src/prelude/common.rs
index e38ef1e147c76..8b116cecb5295 100644
--- a/library/core/src/prelude/common.rs
+++ b/library/core/src/prelude/common.rs
@@ -12,6 +12,9 @@ pub use crate::marker::{Copy, Send, Sized, Sync, Unpin};
#[stable(feature = "core_prelude", since = "1.4.0")]
#[doc(no_inline)]
pub use crate::ops::{Drop, Fn, FnMut, FnOnce};
+#[stable(feature = "async_closure", since = "1.85.0")]
+#[doc(no_inline)]
+pub use crate::ops::{AsyncFn, AsyncFnMut, AsyncFnOnce};
// Re-exported functions
#[stable(feature = "core_prelude", since = "1.4.0")]
From 9e98d2572901d2767df9a26c938aba1f112b332c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Le=C3=B3n=20Orell=20Valerian=20Liehr?= <me@fmease.dev>
Date: Wed, 22 Jan 2025 04:46:55 +0100
Subject: [PATCH 7/7] Library: Finalize dyn compatibility renaming
---
library/std/src/keyword_docs.rs | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/library/std/src/keyword_docs.rs b/library/std/src/keyword_docs.rs
index 0c526eafdf36f..1d26bf37f4d28 100644
--- a/library/std/src/keyword_docs.rs
+++ b/library/std/src/keyword_docs.rs
@@ -2387,13 +2387,12 @@ mod async_keyword {}
/// [`async`]: ../std/keyword.async.html
mod await_keyword {}
-// FIXME(dyn_compat_renaming): Update URL and link text.
#[doc(keyword = "dyn")]
//
/// `dyn` is a prefix of a [trait object]'s type.
///
/// The `dyn` keyword is used to highlight that calls to methods on the associated `Trait`
-/// are [dynamically dispatched]. To use the trait this way, it must be 'dyn-compatible'[^1].
+/// are [dynamically dispatched]. To use the trait this way, it must be *dyn compatible*[^1].
///
/// Unlike generic parameters or `impl Trait`, the compiler does not know the concrete type that
/// is being passed. That is, the type has been [erased].
@@ -2406,7 +2405,7 @@ mod await_keyword {}
/// the function pointer and then that function pointer is called.
///
/// See the Reference for more information on [trait objects][ref-trait-obj]
-/// and [object safety][ref-obj-safety].
+/// and [dyn compatibility][ref-dyn-compat].
///
/// ## Trade-offs
///
@@ -2419,9 +2418,9 @@ mod await_keyword {}
/// [trait object]: ../book/ch17-02-trait-objects.html
/// [dynamically dispatched]: https://en.wikipedia.org/wiki/Dynamic_dispatch
/// [ref-trait-obj]: ../reference/types/trait-object.html
-/// [ref-obj-safety]: ../reference/items/traits.html#object-safety
+/// [ref-dyn-compat]: ../reference/items/traits.html#dyn-compatibility
/// [erased]: https://en.wikipedia.org/wiki/Type_erasure
-/// [^1]: Formerly known as 'object safe'.
+/// [^1]: Formerly known as *object safe*.
mod dyn_keyword {}
#[doc(keyword = "union")]