More derive output improvements #98758

nnethercote · 2022-07-01T11:36:34Z

This PR includes:

Some test improvements.
Some cosmetic changes to derive output that make the code look more like what a human would write.
Some more fundamental improvements to cmp and partial_cmp generation.

bors · 2022-07-01T21:03:39Z

☔ The latest upstream changes (presumably #98767) made this pull request unmergeable. Please resolve the merge conflicts.

Because `derive(Clone)` on unions triggers special behaviour.

Because they are interesting cases with their own code generation paths.

By not committing to either block form or expression form until necessary, we can avoid lots of unnecessary blocks.

It's common to see repeated assertions like this in derived `clone` and `eq` methods: ``` let _: ::core::clone::AssertParamIsClone<u32>; let _: ::core::clone::AssertParamIsClone<u32>; ``` This commit avoids them.

nnethercote · 2022-07-04T08:55:21Z

@bors try @rust-timer queue

rust-timer · 2022-07-04T08:55:22Z

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

bors · 2022-07-04T08:55:29Z

⌛ Trying commit 5010531ad43b005aeb8a7cf77b8a0b4538d0d38b with merge 1a3194ec0771f431c31fa960f7385f68aff6d78f...

nnethercote · 2022-07-04T08:55:45Z

r? @Mark-Simulacrum

bors · 2022-07-04T10:45:56Z

☀️ Try build successful - checks-actions
Build commit: 1a3194ec0771f431c31fa960f7385f68aff6d78f (1a3194ec0771f431c31fa960f7385f68aff6d78f)

rust-timer · 2022-07-04T10:45:58Z

Queued 1a3194ec0771f431c31fa960f7385f68aff6d78f with parent a5c6a48, future comparison URL.

rust-timer · 2022-07-04T13:05:37Z

Finished benchmarking commit (1a3194ec0771f431c31fa960f7385f68aff6d78f): comparison url.

Instruction count

Primary benchmarks: 🎉 relevant improvements found
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions 😿 (primary)	0.5%	0.8%	5
Regressions 😿 (secondary)	1.5%	2.3%	11
Improvements 🎉 (primary)	-0.5%	-1.0%	99
Improvements 🎉 (secondary)	-1.5%	-8.2%	70
All 😿🎉 (primary)	-0.5%	-1.0%	104

Max RSS (memory usage)

Results

Primary benchmarks: mixed results
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions 😿 (primary)	0.0%	0.0%	1
Regressions 😿 (secondary)	2.2%	2.2%	1
Improvements 🎉 (primary)	-1.1%	-1.1%	1
Improvements 🎉 (secondary)	-2.3%	-3.0%	5
All 😿🎉 (primary)	-0.5%	-1.1%	2

Cycles

Results

Primary benchmarks: 😿 relevant regression found
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions 😿 (primary)	15.2%	15.2%	1
Regressions 😿 (secondary)	2.8%	4.4%	18
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	-8.0%	-10.4%	9
All 😿🎉 (primary)	15.2%	15.2%	1

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

the arithmetic mean of the percent change ↩ ↩² ↩³
number of relevant changes ↩ ↩² ↩³

We currently do a match on the comparison of every field in a struct or enum variant. But the last field has a degenerate match like this: ``` match ::core::cmp::Ord::cmp(&self.y, &other.y) { ::core::cmp::Ordering::Equal => ::core::cmp::Ordering::Equal, cmp => cmp, }, ``` This commit changes it to this: ``` ::core::cmp::Ord::cmp(&self.y, &other.y), ``` This is fairly straightforward thanks to the existing `cs_fold1` function. The commit also removes the `cs_fold` function which is no longer used. (Note: there is some repetition now in `cs_cmp` and `cs_partial_cmp`. I will remove that in a follow-up PR.)

Because they now have a single call site each. Also rename `cs_fold1` as `cs_fold`, now that it's the only folding function left.

Mark-Simulacrum · 2022-07-07T13:28:16Z

@bors r+

This looks good to me, thanks!

bors · 2022-07-07T13:28:19Z

📌 Commit 0da063c has been approved by Mark-Simulacrum

It is now in the queue for this repository.

bors · 2022-07-08T05:46:22Z

⌛ Testing commit 0da063c with merge 0bbb9c2abf5a0b76e5c96e4366c5b4a2a0ffb5d2...

bors · 2022-07-08T07:22:27Z

💔 Test failed - checks-actions

rust-log-analyzer · 2022-07-08T07:56:49Z

The job x86_64-apple-2 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

      Memory: 14 GB
      System Firmware Version: VMW71.00V.13989454.B64.1906190538
      Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
      SMC Version (system): 2.8f0
      Serial Number (system): VMEd7XwPIBal
      Provisioning UDID: 4203018E-580F-C1B5-9525-B745CECA79EB

hw.ncpu: 3
hw.byteorder: 1234
---

---- [ui] src/test/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-stack.rs stdout ----
diff of stderr:

1 error: <unknown>:0:0: in function test i32 (i32, i32, i32, i32, i32): call to non-secure function would require passing arguments on stack
+ thread '<unnamed>' panicked at 'assertion failed: `(left == right)`
+   left: `LLVMing`,
+   left: `LLVMing`,
+  right: `Codegenning`', $COMPILER_DIR/rustc_codegen_ssa/src/back/write.rs:1494:21
+ stack backtrace:
+    0:        0x108fce904 - <std::sys_common::backtrace::_print::DisplayBacktrace as core::fmt::Display>::fmt::h61c58d4df24737b8
+    1:        0x109025c1b - core::fmt::write::h2f483c4d4388ea02
+    2:        0x108fc0f9c - std::io::Write::write_fmt::h2eedb57e7da3f2c4
+    3:        0x108fd1937 - std::panicking::default_hook::{{closure}}::h1df7a6c2cd565b88
+    4:        0x108fd1640 - std::panicking::default_hook::he0b569e6d222cabe
+    5:        0x10cd5b70a - rustc_driver[c7d744f0c5661564]::DEFAULT_HOOK::{closure#0}::{closure#0}
+    6:        0x108fd206d - std::panicking::rust_panic_with_hook::h37e4f4ad0e5f549d
+    7:        0x108fd1f13 - std::panicking::begin_panic_handler::{{closure}}::hd7aa257dedfe4195
+    8:        0x108fcedb7 - std::sys_common::backtrace::__rust_end_short_backtrace::heeee4f32e0c89f4b
+    9:        0x108fd1bed - _rust_begin_unwind
+   10:        0x109050e53 - core::panicking::panic_fmt::hedf0f135639938a8
+   11:        0x1090226d7 - core::panicking::assert_failed_inner::h1ff5a83524648fdd
+   12:        0x111679cbe - core[8d8c3749f58b3e93]::panicking::assert_failed::<rustc_codegen_ssa[a5db3e433d49dbc1]::back::write::MainThreadWorkerState, rustc_codegen_ssa[a5db3e433d49dbc1]::back::write::MainThreadWorkerState>
+   13:        0x10cfc538c - std[b14a812ba5aaedfc]::sys_common::backtrace::__rust_begin_short_backtrace::<<rustc_codegen_llvm[aeee86f5e2f4756e]::LlvmCodegenBackend as rustc_codegen_ssa[a5db3e433d49dbc1]::traits::backend::ExtraBackendMethods>::spawn_thread<rustc_codegen_ssa[a5db3e433d49dbc1]::back::write::start_executing_work<rustc_codegen_llvm[aeee86f5e2f4756e]::LlvmCodegenBackend>::{closure#4}, core[8d8c3749f58b3e93]::result::Result<rustc_codegen_ssa[a5db3e433d49dbc1]::back::write::CompiledModules, ()>>::{closure#0}, core[8d8c3749f58b3e93]::result::Result<rustc_codegen_ssa[a5db3e433d49dbc1]::back::write::CompiledModules, ()>>
+   14:        0x10cf9054c - <<std[b14a812ba5aaedfc]::thread::Builder>::spawn_unchecked_<<rustc_codegen_llvm[aeee86f5e2f4756e]::LlvmCodegenBackend as rustc_codegen_ssa[a5db3e433d49dbc1]::traits::backend::ExtraBackendMethods>::spawn_thread<rustc_codegen_ssa[a5db3e433d49dbc1]::back::write::start_executing_work<rustc_codegen_llvm[aeee86f5e2f4756e]::LlvmCodegenBackend>::{closure#4}, core[8d8c3749f58b3e93]::result::Result<rustc_codegen_ssa[a5db3e433d49dbc1]::back::write::CompiledModules, ()>>::{closure#0}, core[8d8c3749f58b3e93]::result::Result<rustc_codegen_ssa[a5db3e433d49dbc1]::back::write::CompiledModules, ()>>::{closure#1} as core[8d8c3749f58b3e93]::ops::function::FnOnce<()>>::call_once::{shim:vtable#0}
+   15:        0x108fdac87 - std::sys::unix::thread::Thread::new::thread_start::hb51135fe0bcf0f8b
+   16:     0x7fff205f18fc - __pthread_start
+ error: internal compiler error: unexpected panic
+ 
+ note: the compiler unexpectedly panicked. this is a bug.
+ 
+ 
+ note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md
+ 
+ note: rustc 1.64.0-nightly (0bbb9c2ab 2022-07-08) running on x86_64-apple-darwin
+ 
+ note: compiler flags: -Z threads=1 -C codegen-units=1 -Z ui-testing -Z deduplicate-diagnostics=no -C strip=debuginfo -C prefer-dynamic -C rpath -C debuginfo=0 --crate-type lib
+ query stack during panic:
+ end of query stack
3 error: aborting due to previous error
4 
---
To only update this specific test, also pass `--test-args cmse-nonsecure/cmse-nonsecure-call/params-on-stack.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage2/bin/rustc" "/Users/runner/work/rust/rust/src/test/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-stack.rs" "-Zthreads=1" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "-C" "prefer-dynamic" "--out-dir" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/test/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-stack" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/Users/runner/work/rust/rust/build/x86_64-apple-darwin/native/rust-test-helpers" "--target" "thumbv8m.main-none-eabi" "--crate-type" "lib" "-L" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/test/ui/cmse-nonsecure/cmse-nonsecure-call/params-on-stack/auxiliary"
stdout: none
--- stderr -------------------------------
error: <unknown>:0:0: in function test i32 (i32, i32, i32, i32, i32): call to non-secure function would require passing arguments on stack
thread '<unnamed>' panicked at 'assertion failed: `(left == right)`
  left: `LLVMing`,
  left: `LLVMing`,
 right: `Codegenning`', /Users/runner/work/rust/rust/compiler/rustc_codegen_ssa/src/back/write.rs:1494:21
stack backtrace:
   0:        0x108fce904 - <std::sys_common::backtrace::_print::DisplayBacktrace as core::fmt::Display>::fmt::h61c58d4df24737b8
   1:        0x109025c1b - core::fmt::write::h2f483c4d4388ea02
   2:        0x108fc0f9c - std::io::Write::write_fmt::h2eedb57e7da3f2c4
   3:        0x108fd1937 - std::panicking::default_hook::{{closure}}::h1df7a6c2cd565b88
   4:        0x108fd1640 - std::panicking::default_hook::he0b569e6d222cabe
   5:        0x10cd5b70a - rustc_driver[c7d744f0c5661564]::DEFAULT_HOOK::{closure#0}::{closure#0}
   6:        0x108fd206d - std::panicking::rust_panic_with_hook::h37e4f4ad0e5f549d
   7:        0x108fd1f13 - std::panicking::begin_panic_handler::{{closure}}::hd7aa257dedfe4195
   8:        0x108fcedb7 - std::sys_common::backtrace::__rust_end_short_backtrace::heeee4f32e0c89f4b
   9:        0x108fd1bed - _rust_begin_unwind
  10:        0x109050e53 - core::panicking::panic_fmt::hedf0f135639938a8
  11:        0x1090226d7 - core::panicking::assert_failed_inner::h1ff5a83524648fdd
  12:        0x111679cbe - core[8d8c3749f58b3e93]::panicking::assert_failed::<rustc_codegen_ssa[a5db3e433d49dbc1]::back::write::MainThreadWorkerState, rustc_codegen_ssa[a5db3e433d49dbc1]::back::write::MainThreadWorkerState>
  13:        0x10cfc538c - std[b14a812ba5aaedfc]::sys_common::backtrace::__rust_begin_short_backtrace::<<rustc_codegen_llvm[aeee86f5e2f4756e]::LlvmCodegenBackend as rustc_codegen_ssa[a5db3e433d49dbc1]::traits::backend::ExtraBackendMethods>::spawn_thread<rustc_codegen_ssa[a5db3e433d49dbc1]::back::write::start_executing_work<rustc_codegen_llvm[aeee86f5e2f4756e]::LlvmCodegenBackend>::{closure#4}, core[8d8c3749f58b3e93]::result::Result<rustc_codegen_ssa[a5db3e433d49dbc1]::back::write::CompiledModules, ()>>::{closure#0}, core[8d8c3749f58b3e93]::result::Result<rustc_codegen_ssa[a5db3e433d49dbc1]::back::write::CompiledModules, ()>>
  14:        0x10cf9054c - <<std[b14a812ba5aaedfc]::thread::Builder>::spawn_unchecked_<<rustc_codegen_llvm[aeee86f5e2f4756e]::LlvmCodegenBackend as rustc_codegen_ssa[a5db3e433d49dbc1]::traits::backend::ExtraBackendMethods>::spawn_thread<rustc_codegen_ssa[a5db3e433d49dbc1]::back::write::start_executing_work<rustc_codegen_llvm[aeee86f5e2f4756e]::LlvmCodegenBackend>::{closure#4}, core[8d8c3749f58b3e93]::result::Result<rustc_codegen_ssa[a5db3e433d49dbc1]::back::write::CompiledModules, ()>>::{closure#0}, core[8d8c3749f58b3e93]::result::Result<rustc_codegen_ssa[a5db3e433d49dbc1]::back::write::CompiledModules, ()>>::{closure#1} as core[8d8c3749f58b3e93]::ops::function::FnOnce<()>>::call_once::{shim:vtable#0}
  15:        0x108fdac87 - std::sys::unix::thread::Thread::new::thread_start::hb51135fe0bcf0f8b
  16:     0x7fff205f18fc - __pthread_start
error: internal compiler error: unexpected panic

note: the compiler unexpectedly panicked. this is a bug.


note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md

note: rustc 1.64.0-nightly (0bbb9c2ab 2022-07-08) running on x86_64-apple-darwin

note: compiler flags: -Z threads=1 -C codegen-units=1 -Z ui-testing -Z deduplicate-diagnostics=no -C strip=debuginfo -C prefer-dynamic -C rpath -C debuginfo=0 --crate-type lib
query stack during panic:
end of query stack
error: aborting due to previous error
------------------------------------------

lqd · 2022-07-08T08:11:40Z

That failure may be unrelated to the PR: it kinda looks like the super rare "parallel-codegen thread status unexpected state machine transition" panic we've seen before (I think there's an open issue, at least I know I've discussed this with mw before... somewhere). Or some weird LLVM error that manifests as the same assertion triggering, similar to #95679 but with "call to non-secure function would require passing arguments on stack".

let's see: @bors retry

bors · 2022-07-08T12:44:18Z

⌛ Testing commit 0da063c with merge fbdb07f...

bors · 2022-07-08T15:24:51Z

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing fbdb07f to master...

rust-timer · 2022-07-08T19:46:38Z

Finished benchmarking commit (fbdb07f): comparison url.

Instruction count

Primary benchmarks: 🎉 relevant improvements found
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions 😿 (primary)	0.6%	0.8%	2
Regressions 😿 (secondary)	1.6%	2.3%	10
Improvements 🎉 (primary)	-0.4%	-0.6%	55
Improvements 🎉 (secondary)	-2.1%	-8.0%	34
All 😿🎉 (primary)	-0.4%	0.8%	57

Max RSS (memory usage)

Results

Primary benchmarks: mixed results
Secondary benchmarks: 🎉 relevant improvements found

	mean¹	max	count²
Regressions 😿 (primary)	1.9%	1.9%	1
Regressions 😿 (secondary)	N/A	N/A	0
Improvements 🎉 (primary)	-1.5%	-3.8%	4
Improvements 🎉 (secondary)	-2.9%	-3.9%	15
All 😿🎉 (primary)	-0.8%	-3.8%	5

Cycles

Results

Primary benchmarks: 🎉 relevant improvements found
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions 😿 (primary)	N/A	N/A	0
Regressions 😿 (secondary)	2.7%	2.8%	2
Improvements 🎉 (primary)	-2.9%	-3.8%	2
Improvements 🎉 (secondary)	-7.9%	-11.2%	10
All 😿🎉 (primary)	-2.9%	-3.8%	2

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

the arithmetic mean of the percent change ↩ ↩² ↩³
number of relevant changes ↩ ↩² ↩³

Pkgsrc changes: * Add patch to fix vendor/kqueue issue (on 32-bit hosts) * Adjust other patches & line numbers * Version bumps & checksum changes. Upstream changes: Version 1.64.0 (2022-09-22) =========================== Language -------- - [Unions with mutable references or tuples of allowed types are now allowed](rust-lang/rust#97995) - It is now considered valid to deallocate memory pointed to by a shared reference `&T` [if every byte in `T` is inside an `UnsafeCell`](rust-lang/rust#98017) - Unused tuple struct fields are now warned against in an allow-by-default lint, [`unused_tuple_struct_fields`] (rust-lang/rust#95977), similar to the existing warning for unused struct fields. This lint will become warn-by-default in the future. Compiler -------- - [Add Nintendo Switch as tier 3 target] (rust-lang/rust#88991) - Refer to Rust's [platform support page][platform-support-doc] for more information on Rust's tiered platform support. - [Only compile `#[used]` as llvm.compiler.used for ELF targets] (rust-lang/rust#93718) - [Add the `--diagnostic-width` compiler flag to define the terminal width.] (rust-lang/rust#95635) - [Add support for link-flavor `rust-lld` for iOS, tvOS and watchOS] (rust-lang/rust#98771) Libraries --------- - [Remove restrictions on compare-exchange memory ordering.] (rust-lang/rust#98383) - You can now `write!` or `writeln!` into an `OsString`: [Implement `fmt::Write` for `OsString`](rust-lang/rust#97915) - [Make RwLockReadGuard covariant] (rust-lang/rust#96820) - [Implement `FusedIterator` for `std::net::[Into]Incoming`] (rust-lang/rust#97300) - [`impl<T: AsRawFd> AsRawFd for {Arc,Box}<T>`] (rust-lang/rust#97437) - [`ptr::copy` and `ptr::swap` are doing untyped copies] (rust-lang/rust#97712) - [Add cgroupv1 support to `available_parallelism`] (rust-lang/rust#97925) - [Mitigate many incorrect uses of `mem::uninitialized`] (rust-lang/rust#99182) Stabilized APIs --------------- - [`future::IntoFuture`] (https://doc.rust-lang.org/stable/std/future/trait.IntoFuture.html) - [`future::poll_fn`] (https://doc.rust-lang.org/stable/std/future/fn.poll_fn.html) - [`task::ready!`] (https://doc.rust-lang.org/stable/std/task/macro.ready.html) - [`num::NonZero*::checked_mul`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.checked_mul) - [`num::NonZero*::checked_pow`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.checked_pow) - [`num::NonZero*::saturating_mul`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.saturating_mul) - [`num::NonZero*::saturating_pow`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.saturating_pow) - [`num::NonZeroI*::abs`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.abs) - [`num::NonZeroI*::checked_abs`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.checked_abs) - [`num::NonZeroI*::overflowing_abs`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.overflowing_abs) - [`num::NonZeroI*::saturating_abs`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.saturating_abs) - [`num::NonZeroI*::unsigned_abs`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.unsigned_abs) - [`num::NonZeroI*::wrapping_abs`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.wrapping_abs) - [`num::NonZeroU*::checked_add`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.checked_add) - [`num::NonZeroU*::checked_next_power_of_two`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.checked_next_power_of_two) - [`num::NonZeroU*::saturating_add`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.saturating_add) - [`os::unix::process::CommandExt::process_group`] (https://doc.rust-lang.org/stable/std/os/unix/process/trait.CommandExt.html#tymethod.process_group) - [`os::windows::fs::FileTypeExt::is_symlink_dir`] (https://doc.rust-lang.org/stable/std/os/windows/fs/trait.FileTypeExt.html#tymethod.is_symlink_dir) - [`os::windows::fs::FileTypeExt::is_symlink_file`] (https://doc.rust-lang.org/stable/std/os/windows/fs/trait.FileTypeExt.html#tymethod.is_symlink_file) These types were previously stable in `std::ffi`, but are now also available in `core` and `alloc`: - [`core::ffi::CStr`] (https://doc.rust-lang.org/stable/core/ffi/struct.CStr.html) - [`core::ffi::FromBytesWithNulError`] (https://doc.rust-lang.org/stable/core/ffi/struct.FromBytesWithNulError.html) - [`alloc::ffi::CString`] (https://doc.rust-lang.org/stable/alloc/ffi/struct.CString.html) - [`alloc::ffi::FromVecWithNulError`] (https://doc.rust-lang.org/stable/alloc/ffi/struct.FromVecWithNulError.html) - [`alloc::ffi::IntoStringError`] (https://doc.rust-lang.org/stable/alloc/ffi/struct.IntoStringError.html) - [`alloc::ffi::NulError`] (https://doc.rust-lang.org/stable/alloc/ffi/struct.NulError.html) These types were previously stable in `std::os::raw`, but are now also available in `core::ffi` and `std::ffi`: - [`ffi::c_char`] (https://doc.rust-lang.org/stable/std/ffi/type.c_char.html) - [`ffi::c_double`] (https://doc.rust-lang.org/stable/std/ffi/type.c_double.html) - [`ffi::c_float`] (https://doc.rust-lang.org/stable/std/ffi/type.c_float.html) - [`ffi::c_int`] (https://doc.rust-lang.org/stable/std/ffi/type.c_int.html) - [`ffi::c_long`] (https://doc.rust-lang.org/stable/std/ffi/type.c_long.html) - [`ffi::c_longlong`] (https://doc.rust-lang.org/stable/std/ffi/type.c_longlong.html) - [`ffi::c_schar`] (https://doc.rust-lang.org/stable/std/ffi/type.c_schar.html) - [`ffi::c_short`] (https://doc.rust-lang.org/stable/std/ffi/type.c_short.html) - [`ffi::c_uchar`] (https://doc.rust-lang.org/stable/std/ffi/type.c_uchar.html) - [`ffi::c_uint`] (https://doc.rust-lang.org/stable/std/ffi/type.c_uint.html) - [`ffi::c_ulong`] (https://doc.rust-lang.org/stable/std/ffi/type.c_ulong.html) - [`ffi::c_ulonglong`] (https://doc.rust-lang.org/stable/std/ffi/type.c_ulonglong.html) - [`ffi::c_ushort`] (https://doc.rust-lang.org/stable/std/ffi/type.c_ushort.html) These APIs are now usable in const contexts: - [`slice::from_raw_parts`] (https://doc.rust-lang.org/stable/core/slice/fn.from_raw_parts.html) Cargo ----- - [Packages can now inherit settings from the workspace so that the settings can be centralized in one place.] (rust-lang/cargo#10859) See [`workspace.package`](https://doc.rust-lang.org/nightly/cargo/reference/workspaces.html#the-workspacepackage-table) and [`workspace.dependencies`](https://doc.rust-lang.org/nightly/cargo/reference/workspaces.html#the-workspacedependencies-table) for more details on how to define these common settings. - [Cargo commands can now accept multiple `--target` flags to build for multiple targets at once] (rust-lang/cargo#10766), and the [`build.target`](https://doc.rust-lang.org/nightly/cargo/reference/config.html#buildtarget) config option may now take an array of multiple targets. - [The `--jobs` argument can now take a negative number to count backwards from the max CPUs.] (rust-lang/cargo#10844) - [`cargo add` will now update `Cargo.lock`.] (rust-lang/cargo#10902) - [Added](rust-lang/cargo#10838) the [`--crate-type`](https://doc.rust-lang.org/nightly/cargo/commands/cargo-rustc.html#option-cargo-rustc---crate-type) flag to `cargo rustc` to override the crate type. - [Significantly improved the performance fetching git dependencies from GitHub when using a hash in the `rev` field.] (rust-lang/cargo#10079) Misc ---- - [The `rust-analyzer` rustup component is now available on the stable channel.] (rust-lang/rust#98640) Compatibility Notes ------------------- - The minimum required versions for all `-linux-gnu` targets are now at least kernel 3.2 and glibc 2.17, for targets that previously supported older versions: [Increase the minimum linux-gnu versions](rust-lang/rust#95026) - [Network primitives are now implemented with the ideal Rust layout, not the C system layout] (rust-lang/rust#78802). This can cause problems when transmuting the types. - [Add assertion that `transmute_copy`'s `U` is not larger than `T`] (rust-lang/rust#98839) - [A soundness bug in `BTreeMap` was fixed] (rust-lang/rust#99413) that allowed data it was borrowing to be dropped before the container. - [The Drop behavior of C-like enums cast to ints has changed] (rust-lang/rust#96862). These are already discouraged by a compiler warning. - [Relate late-bound closure lifetimes to parent fn in NLL] (rust-lang/rust#98835) - [Errors at const-eval time are now in future incompatibility reports] (rust-lang/rust#97743) - On the `thumbv6m-none-eabi` target, some incorrect `asm!` statements were erroneously accepted if they used the high registers (r8 to r14) as an input/output operand. [This is no longer accepted] (rust-lang/rust#99155). - [`impl Trait` was accidentally accepted as the associated type value of return-position `impl Trait`] (rust-lang/rust#97346), without fulfilling all the trait bounds of that associated type, as long as the hidden type satisfies said bounds. This has been fixed. Internal Changes ---------------- These changes do not affect any public interfaces of Rust, but they represent significant improvements to the performance or internals of rustc and related tools. - Windows builds now use profile-guided optimization, providing 10-20% improvements to compiler performance: [Utilize PGO for windows x64 rustc dist builds] (rust-lang/rust#96978) - [Stop keeping metadata in memory before writing it to disk] (rust-lang/rust#96544) - [compiletest: strip debuginfo by default for mode=ui] (rust-lang/rust#98140) - Many improvements to generated code for derives, including performance improvements: - [Don't use match-destructuring for derived ops on structs.] (rust-lang/rust#98446) - [Many small deriving cleanups] (rust-lang/rust#98741) - [More derive output improvements] (rust-lang/rust#98758) - [Clarify deriving code](rust-lang/rust#98915) - [Final derive output improvements] (rust-lang/rust#99046) - [Stop injecting `#[allow(unused_qualifications)]` in generated `derive` implementations](rust-lang/rust#99485) - [Improve `derive(Debug)`](rust-lang/rust#98190) - [Bump to clap 3](rust-lang/rust#98213) - [fully move dropck to mir](rust-lang/rust#98641) - [Optimize `Vec::insert` for the case where `index == len`.] (rust-lang/rust#98755) - [Convert rust-analyzer to an in-tree tool] (rust-lang/rust#99603)

PR rust-lang#98758 introduced code to avoid redundant assertions in derived code like this: ``` let _: ::core::clone::AssertParamIsClone<u32>; let _: ::core::clone::AssertParamIsClone<u32>; ``` But the predicate `is_simple_path` introduced as part of this failed to account for generic arguments. Therefore the deriving code erroneously considers types like `Option<bool>` and `Option<f32>` to be the same. This commit fixes `is_simple_path`. Fixes rust-lang#103157.

PR rust-lang#98758 introduced code to avoid redundant assertions in derived code like this: ``` let _: ::core::clone::AssertParamIsClone<u32>; let _: ::core::clone::AssertParamIsClone<u32>; ``` But the predicate `is_simple_path` introduced as part of this failed to account for generic arguments. Therefore the deriving code erroneously considers types like `Option<bool>` and `Option<f32>` to be the same. This commit fixes `is_simple_path`. Fixes rust-lang#103157. (cherry picked from commit 9a23f60)

PR rust-lang#98758 introduced code to avoid redundant assertions in derived code like this: ``` let _: ::core::clone::AssertParamIsClone<u32>; let _: ::core::clone::AssertParamIsClone<u32>; ``` But the predicate `is_simple_path` introduced as part of this failed to account for generic arguments. Therefore the deriving code erroneously considers types like `Option<bool>` and `Option<f32>` to be the same. This commit fixes `is_simple_path`. Fixes rust-lang#103157.

Pkgsrc changes: * This package now contains rust-analyzer, so implicitly conflicts with that pkgsrc package. The same goes for the rust-src package. * Add NetBSD/arm6 port * Add unfinished NetBSD/mipsel port * Revert the use of the internal LLVM, should now build with the new pkgsrc LLVM (15). * Add depndence on compat80 for sparc64 to fix the build * Adapt patches * Add CHECK_INTERPRETER_SKIP for a few (mostly unused) files. (A proper fix may come later.) Upstream changes: Version 1.64.0 (2022-09-22) =========================== Language -------- - [Unions with mutable references or tuples of allowed types are now allowed](rust-lang/rust#97995) - It is now considered valid to deallocate memory pointed to by a shared reference `&T` [if every byte in `T` is inside an `UnsafeCell`](rust-lang/rust#98017) - Unused tuple struct fields are now warned against in an allow-by-default lint, [`unused_tuple_struct_fields`] (rust-lang/rust#95977), similar to the existing warning for unused struct fields. This lint will become warn-by-default in the future. Compiler -------- - [Add Nintendo Switch as tier 3 target] (rust-lang/rust#88991) - Refer to Rust's [platform support page][platform-support-doc] for more information on Rust's tiered platform support. - [Only compile `#[used]` as llvm.compiler.used for ELF targets] (rust-lang/rust#93718) - [Add the `--diagnostic-width` compiler flag to define the terminal width.] (rust-lang/rust#95635) - [Add support for link-flavor `rust-lld` for iOS, tvOS and watchOS] (rust-lang/rust#98771) Libraries --------- - [Remove restrictions on compare-exchange memory ordering.] (rust-lang/rust#98383) - You can now `write!` or `writeln!` into an `OsString`: [Implement `fmt::Write` for `OsString`](rust-lang/rust#97915) - [Make RwLockReadGuard covariant] (rust-lang/rust#96820) - [Implement `FusedIterator` for `std::net::[Into]Incoming`] (rust-lang/rust#97300) - [`impl<T: AsRawFd> AsRawFd for {Arc,Box}<T>`] (rust-lang/rust#97437) - [`ptr::copy` and `ptr::swap` are doing untyped copies] (rust-lang/rust#97712) - [Add cgroupv1 support to `available_parallelism`] (rust-lang/rust#97925) - [Mitigate many incorrect uses of `mem::uninitialized`] (rust-lang/rust#99182) Stabilized APIs --------------- - [`future::IntoFuture`] (https://doc.rust-lang.org/stable/std/future/trait.IntoFuture.html) - [`future::poll_fn`] (https://doc.rust-lang.org/stable/std/future/fn.poll_fn.html) - [`task::ready!`] (https://doc.rust-lang.org/stable/std/task/macro.ready.html) - [`num::NonZero*::checked_mul`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.checked_mul) - [`num::NonZero*::checked_pow`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.checked_pow) - [`num::NonZero*::saturating_mul`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.saturating_mul) - [`num::NonZero*::saturating_pow`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.saturating_pow) - [`num::NonZeroI*::abs`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.abs) - [`num::NonZeroI*::checked_abs`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.checked_abs) - [`num::NonZeroI*::overflowing_abs`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.overflowing_abs) - [`num::NonZeroI*::saturating_abs`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.saturating_abs) - [`num::NonZeroI*::unsigned_abs`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.unsigned_abs) - [`num::NonZeroI*::wrapping_abs`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.wrapping_abs) - [`num::NonZeroU*::checked_add`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.checked_add) - [`num::NonZeroU*::checked_next_power_of_two`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.checked_next_power_of_two) - [`num::NonZeroU*::saturating_add`] (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.saturating_add) - [`os::unix::process::CommandExt::process_group`] (https://doc.rust-lang.org/stable/std/os/unix/process/trait.CommandExt.html#tymethod.process_group) - [`os::windows::fs::FileTypeExt::is_symlink_dir`] (https://doc.rust-lang.org/stable/std/os/windows/fs/trait.FileTypeExt.html#tymethod.is_symlink_dir) - [`os::windows::fs::FileTypeExt::is_symlink_file`] (https://doc.rust-lang.org/stable/std/os/windows/fs/trait.FileTypeExt.html#tymethod.is_symlink_file) These types were previously stable in `std::ffi`, but are now also available in `core` and `alloc`: - [`core::ffi::CStr`] (https://doc.rust-lang.org/stable/core/ffi/struct.CStr.html) - [`core::ffi::FromBytesWithNulError`] (https://doc.rust-lang.org/stable/core/ffi/struct.FromBytesWithNulError.html) - [`alloc::ffi::CString`] (https://doc.rust-lang.org/stable/alloc/ffi/struct.CString.html) - [`alloc::ffi::FromVecWithNulError`] (https://doc.rust-lang.org/stable/alloc/ffi/struct.FromVecWithNulError.html) - [`alloc::ffi::IntoStringError`] (https://doc.rust-lang.org/stable/alloc/ffi/struct.IntoStringError.html) - [`alloc::ffi::NulError`] (https://doc.rust-lang.org/stable/alloc/ffi/struct.NulError.html) These types were previously stable in `std::os::raw`, but are now also available in `core::ffi` and `std::ffi`: - [`ffi::c_char`] (https://doc.rust-lang.org/stable/std/ffi/type.c_char.html) - [`ffi::c_double`] (https://doc.rust-lang.org/stable/std/ffi/type.c_double.html) - [`ffi::c_float`] (https://doc.rust-lang.org/stable/std/ffi/type.c_float.html) - [`ffi::c_int`] (https://doc.rust-lang.org/stable/std/ffi/type.c_int.html) - [`ffi::c_long`] (https://doc.rust-lang.org/stable/std/ffi/type.c_long.html) - [`ffi::c_longlong`] (https://doc.rust-lang.org/stable/std/ffi/type.c_longlong.html) - [`ffi::c_schar`] (https://doc.rust-lang.org/stable/std/ffi/type.c_schar.html) - [`ffi::c_short`] (https://doc.rust-lang.org/stable/std/ffi/type.c_short.html) - [`ffi::c_uchar`] (https://doc.rust-lang.org/stable/std/ffi/type.c_uchar.html) - [`ffi::c_uint`] (https://doc.rust-lang.org/stable/std/ffi/type.c_uint.html) - [`ffi::c_ulong`] (https://doc.rust-lang.org/stable/std/ffi/type.c_ulong.html) - [`ffi::c_ulonglong`] (https://doc.rust-lang.org/stable/std/ffi/type.c_ulonglong.html) - [`ffi::c_ushort`] (https://doc.rust-lang.org/stable/std/ffi/type.c_ushort.html) These APIs are now usable in const contexts: - [`slice::from_raw_parts`] (https://doc.rust-lang.org/stable/core/slice/fn.from_raw_parts.html) Cargo ----- - [Packages can now inherit settings from the workspace so that the settings can be centralized in one place.] (rust-lang/cargo#10859) See [`workspace.package`](https://doc.rust-lang.org/nightly/cargo/reference/workspaces.html#the-workspacepackage-table) and [`workspace.dependencies`](https://doc.rust-lang.org/nightly/cargo/reference/workspaces.html#the-workspacedependencies-table) for more details on how to define these common settings. - [Cargo commands can now accept multiple `--target` flags to build for multiple targets at once] (rust-lang/cargo#10766), and the [`build.target`](https://doc.rust-lang.org/nightly/cargo/reference/config.html#buildtarget) config option may now take an array of multiple targets. - [The `--jobs` argument can now take a negative number to count backwards from the max CPUs.] (rust-lang/cargo#10844) - [`cargo add` will now update `Cargo.lock`.] (rust-lang/cargo#10902) - [Added](rust-lang/cargo#10838) the [`--crate-type`](https://doc.rust-lang.org/nightly/cargo/commands/cargo-rustc.html#option-cargo-rustc---crate-type) flag to `cargo rustc` to override the crate type. - [Significantly improved the performance fetching git dependencies from GitHub when using a hash in the `rev` field.] (rust-lang/cargo#10079) Misc ---- - [The `rust-analyzer` rustup component is now available on the stable channel.] (rust-lang/rust#98640) Compatibility Notes ------------------- - The minimum required versions for all `-linux-gnu` targets are now at least kernel 3.2 and glibc 2.17, for targets that previously supported older versions: [Increase the minimum linux-gnu versions](rust-lang/rust#95026) - [Network primitives are now implemented with the ideal Rust layout, not the C system layout] (rust-lang/rust#78802). This can cause problems when transmuting the types. - [Add assertion that `transmute_copy`'s `U` is not larger than `T`] (rust-lang/rust#98839) - [A soundness bug in `BTreeMap` was fixed] (rust-lang/rust#99413) that allowed data it was borrowing to be dropped before the container. - [The Drop behavior of C-like enums cast to ints has changed] (rust-lang/rust#96862). These are already discouraged by a compiler warning. - [Relate late-bound closure lifetimes to parent fn in NLL] (rust-lang/rust#98835) - [Errors at const-eval time are now in future incompatibility reports] (rust-lang/rust#97743) - On the `thumbv6m-none-eabi` target, some incorrect `asm!` statements were erroneously accepted if they used the high registers (r8 to r14) as an input/output operand. [This is no longer accepted] (rust-lang/rust#99155). - [`impl Trait` was accidentally accepted as the associated type value of return-position `impl Trait`] (rust-lang/rust#97346), without fulfilling all the trait bounds of that associated type, as long as the hidden type satisfies said bounds. This has been fixed. Internal Changes ---------------- These changes do not affect any public interfaces of Rust, but they represent significant improvements to the performance or internals of rustc and related tools. - Windows builds now use profile-guided optimization, providing 10-20% improvements to compiler performance: [Utilize PGO for windows x64 rustc dist builds] (rust-lang/rust#96978) - [Stop keeping metadata in memory before writing it to disk] (rust-lang/rust#96544) - [compiletest: strip debuginfo by default for mode=ui] (rust-lang/rust#98140) - Many improvements to generated code for derives, including performance improvements: - [Don't use match-destructuring for derived ops on structs.] (rust-lang/rust#98446) - [Many small deriving cleanups] (rust-lang/rust#98741) - [More derive output improvements] (rust-lang/rust#98758) - [Clarify deriving code](rust-lang/rust#98915) - [Final derive output improvements] (rust-lang/rust#99046) - [Stop injecting `#[allow(unused_qualifications)]` in generated `derive` implementations](rust-lang/rust#99485) - [Improve `derive(Debug)`](rust-lang/rust#98190) - [Bump to clap 3](rust-lang/rust#98213) - [fully move dropck to mir](rust-lang/rust#98641) - [Optimize `Vec::insert` for the case where `index == len`.] (rust-lang/rust#98755) - [Convert rust-analyzer to an in-tree tool] (rust-lang/rust#99603)

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 1, 2022

nnethercote marked this pull request as draft July 1, 2022 11:36

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 1, 2022

nnethercote added 5 commits July 4, 2022 18:29

Add a union to the deriving-all-codegen.rs test.

9d38c45

Because `derive(Clone)` on unions triggers special behaviour.

Add 0-variant and 1-variant enums to the deriving-all-codegen.rs test.

d4ecc4f

Because they are interesting cases with their own code generation paths.

Avoid unnecessary blocks in derive output.

5762d23

By not committing to either block form or expression form until necessary, we can avoid lots of unnecessary blocks.

Don't repeat AssertParamIs{Clone,Eq} assertions.

a7b1d31

It's common to see repeated assertions like this in derived `clone` and `eq` methods: ``` let _: ::core::clone::AssertParamIsClone<u32>; let _: ::core::clone::AssertParamIsClone<u32>; ``` This commit avoids them.

Avoid unnecessary 1-tuples in derived code.

2c911dc

nnethercote force-pushed the more-derive-output-improvements branch from f9636f7 to 5010531 Compare July 4, 2022 08:53

nnethercote marked this pull request as ready for review July 4, 2022 08:54

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 4, 2022

rust-highfive assigned Mark-Simulacrum Jul 4, 2022

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Jul 4, 2022

nnethercote added 2 commits July 5, 2022 09:34

Inline and remove the cs_fold_* functions.

0da063c

Because they now have a single call site each. Also rename `cs_fold1` as `cs_fold`, now that it's the only folding function left.

nnethercote force-pushed the more-derive-output-improvements branch from 5010531 to 0da063c Compare July 4, 2022 23:41

nnethercote mentioned this pull request Jul 5, 2022

Clarify deriving code #98915

Merged

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 7, 2022

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 7, 2022

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 8, 2022

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 8, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 8, 2022

bors merged commit fbdb07f into rust-lang:master Jul 8, 2022

rustbot added this to the 1.64.0 milestone Jul 8, 2022

This was referenced Jul 8, 2022

Don't derive PartialEq::ne. #98655

Merged

Final derive output improvements #99046

Merged

nnethercote deleted the more-derive-output-improvements branch July 8, 2022 22:51

compiler-errors mentioned this pull request Aug 21, 2023

Weird f32 PartialEq behavior on 1.64 -> 1.65 #115071

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

More derive output improvements #98758

More derive output improvements #98758

nnethercote commented Jul 1, 2022 •

edited

Loading

bors commented Jul 1, 2022

nnethercote commented Jul 4, 2022

rust-timer commented Jul 4, 2022

bors commented Jul 4, 2022

nnethercote commented Jul 4, 2022

bors commented Jul 4, 2022

rust-timer commented Jul 4, 2022

rust-timer commented Jul 4, 2022

Mark-Simulacrum commented Jul 7, 2022

bors commented Jul 7, 2022

bors commented Jul 8, 2022

bors commented Jul 8, 2022

rust-log-analyzer commented Jul 8, 2022

lqd commented Jul 8, 2022 •

edited

Loading

bors commented Jul 8, 2022

bors commented Jul 8, 2022

rust-timer commented Jul 8, 2022

More derive output improvements #98758

More derive output improvements #98758

Conversation

nnethercote commented Jul 1, 2022 • edited Loading

bors commented Jul 1, 2022

nnethercote commented Jul 4, 2022

rust-timer commented Jul 4, 2022

bors commented Jul 4, 2022

nnethercote commented Jul 4, 2022

bors commented Jul 4, 2022

rust-timer commented Jul 4, 2022

rust-timer commented Jul 4, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Mark-Simulacrum commented Jul 7, 2022

bors commented Jul 7, 2022

bors commented Jul 8, 2022

bors commented Jul 8, 2022

rust-log-analyzer commented Jul 8, 2022

lqd commented Jul 8, 2022 • edited Loading

bors commented Jul 8, 2022

bors commented Jul 8, 2022

rust-timer commented Jul 8, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

nnethercote commented Jul 1, 2022 •

edited

Loading

lqd commented Jul 8, 2022 •

edited

Loading