Rollup of 8 pull requests #120671

matthiaskrgr · 2024-02-05T10:07:29Z

Successful merges:

std::error::Error -> Trait Implementations: lifetimes consistency improvement #113833 (std::error::Error -> Trait Implementations: lifetimes consistency improvement)
PartialEq, PartialOrd: update and synchronize handling of transitive chains #115386 (PartialEq, PartialOrd: update and synchronize handling of transitive chains)
make matching on NaN a hard error, and remove the rest of illegal_floating_point_literal_pattern #116284 (make matching on NaN a hard error, and remove the rest of illegal_floating_point_literal_pattern)
Add LocalWaker and ContextBuilder types to core, and LocalWake trait to alloc. #118960 (Add LocalWaker and ContextBuilder types to core, and LocalWake trait to alloc.)
Use <T, U> for array/slice equality impls #120384 (Use <T, U> for array/slice equality impls)
riscv only supports split_debuginfo=off for now #120518 (riscv only supports split_debuginfo=off for now)
Remove unused struct #120657 (Remove unused struct)
target: default to the medium code model on LoongArch targets #120661 (target: default to the medium code model on LoongArch targets)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

…rovement

This reverts commit 3f1ad47.

…onding impls exist

…w the extention of contexts by futures

…y removing a #[cfg(target_has_atomic = ptr)]

…t-lang#96992.

Co-authored-by: Mark Rousskov <mark.simulacrum@gmail.com>

…ation

This also removes * impl From<&Context> for ContextBuilder * Context::try_waker() The from implementation is removed because now that wakers are always supported, there are less incentives to override the current context. Before, the incentive was to add Waker support to a reactor that didn't have any.

Makes the trait implementation documentation for arrays and slices appear more consistent.

Disable packed/unpacked options for riscv linux/android. Other riscv targets already only have the off option. The packed/unpacked options might be supported in the future. See upstream issue for more details: llvm/llvm-project#56642 Fixes rust-lang#110224

Co-authored-by: teor <teor@riseup.net>

The Rust LoongArch targets have been using the default LLVM code model so far, which is "small" in LLVM-speak and "normal" in LoongArch-speak. As described in the "Code Model" section of LoongArch ELF psABI spec v20231219 [1], one can only make function calls as far as ±128MiB with the "normal" code model; this is insufficient for very large software containing Rust components that needs to be linked into the big text section, such as Chromium. Because: * we do not want to ask users to recompile std if they are to build such software, * objects compiled with larger code models can be linked with those with smaller code models without problems, and * the "medium" code model is comparable to the "small"/"normal" one performance-wise (same data access pattern; each function call becomes 2-insn long and indirect, but this may be relaxed back into the direct 1-insn form in a future LLVM version), but is able to perform function calls within ±128GiB, it is better to just switch the targets to the "medium" code model, which is also "medium" in LLVM-speak. [1]: https://github.com/loongson/la-abi-specs/blob/v2.30/laelf.adoc#code-models

…piler-errors riscv only supports split_debuginfo=off for now Disable packed/unpacked options for riscv linux/android. Other riscv targets already only have the off option. The packed/unpacked options might be supported in the future. See upstream issue for more details: llvm/llvm-project#56642 Fixes rust-lang#110224

Remove unused struct Detected by rust-lang#118257

…r,Nilstrieb target: default to the medium code model on LoongArch targets The Rust LoongArch targets have been using the default LLVM code model so far, which is "small" in LLVM-speak and "normal" in LoongArch-speak. As [described][1] in the "Code Model" section of LoongArch ELF psABI spec v20231219, one can only make function calls as far as ±128MiB with the "normal" code model; this is insufficient for very large software containing Rust components that needs to be linked into the big text section, such as Chromium. Because: * we do not want to ask users to recompile std if they are to build such software, * objects compiled with larger code models can be linked with those with smaller code models without problems, and * the "medium" code model is comparable to the "small"/"normal" one performance-wise (same data access pattern; each function call becomes 2-insn long and indirect, but this may be relaxed back into the direct 1-insn form in a future LLVM version), but is able to perform function calls within ±128GiB, it is better to just switch the targets to the "medium" code model, which is also "medium" in LLVM-speak. [1]: https://github.com/loongson/la-abi-specs/blob/v2.30/laelf.adoc#code-models

matthiaskrgr · 2024-02-05T10:07:42Z

@bors r+ rollup=never p=8

bors · 2024-02-05T10:07:44Z

📌 Commit dc0b1f9 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-02-05T10:32:15Z

⌛ Testing commit dc0b1f9 with merge 7cfae64...

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#113833 (`std::error::Error` -> Trait Implementations: lifetimes consistency improvement) - rust-lang#115386 (PartialEq, PartialOrd: update and synchronize handling of transitive chains) - rust-lang#116284 (make matching on NaN a hard error, and remove the rest of illegal_floating_point_literal_pattern) - rust-lang#118960 (Add LocalWaker and ContextBuilder types to core, and LocalWake trait to alloc.) - rust-lang#120384 (Use `<T, U>` for array/slice equality `impl`s) - rust-lang#120518 (riscv only supports split_debuginfo=off for now) - rust-lang#120657 (Remove unused struct) - rust-lang#120661 (target: default to the medium code model on LoongArch targets) r? `@ghost` `@rustbot` modify labels: rollup

matthiaskrgr · 2024-02-05T12:57:45Z

seems to be stuck while uploading artifacts :/

matthiaskrgr · 2024-02-05T13:22:49Z

@bors retry

bors · 2024-02-05T13:23:59Z

⌛ Testing commit dc0b1f9 with merge 86eaa89...

rust-log-analyzer · 2024-02-05T13:24:33Z

A job failed! Check out the build log: (web) (plain)

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

bors · 2024-02-05T15:39:25Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 86eaa89 to master...

rust-timer · 2024-02-05T15:41:40Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#113833	`std::error::Error` -> Trait Implementations: lifetimes con…	`d002ff84040dfec9855a382a4afb182136331861` (link)
#115386	PartialEq, PartialOrd: update and synchronize handling of t…	`12ddadd47c37954861cd1ee327b107225aff199b` (link)
#116284	make matching on NaN a hard error, and remove the rest of i…	`eda6540f134dc6ca90ebb1aadd83512cdc924781` (link)
#118960	Add LocalWaker and ContextBuilder types to core, and LocalW…	`7349ce69fff301fa0538d3a4ab61841075c3209b` (link)
#120384	Use `<T, U>` for array/slice equality `impl`s	`f87263f62cf973bbc5b8b143016f1fc17a42aa48` (link)
#120518	riscv only supports split_debuginfo=off for now	`0e864d49ce6829db1b490278db7e3668936d8a84` (link)
#120657	Remove unused struct	`1d85d87646661aa58380ff6cbbc97c4441674005` (link)
#120661	target: default to the medium code model on LoongArch targe…	`f4c5754e86101a46e6de6f91a0f4e0008fe1c811` (link)

previous master: 8c0b4f67c9

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2024-02-05T16:55:16Z

Finished benchmarking commit (86eaa89): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.4%	[-0.4%, -0.4%]	1
Improvements ✅ (secondary)	-1.4%	[-1.6%, -1.3%]	3
All ❌✅ (primary)	-0.4%	[-0.4%, -0.4%]	1

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	2.6%	[2.6%, 2.6%]	1
Regressions ❌ (secondary)	2.2%	[2.1%, 2.2%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.6%	[2.6%, 2.6%]	1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.0%	[0.0%, 0.0%]	3
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.0%	[0.0%, 0.0%]	3

Bootstrap: 659.551s -> 658.805s (-0.11%)
Artifact size: 308.15 MiB -> 308.15 MiB (0.00%)

WiktorPrzetacznik and others added 30 commits July 18, 2023 17:42

std::error::Error -> Trait Implementations: lifetimes consistency imp…

fbaa7fc

…rovement

Update README.md

3f1ad47

Revert "Update README.md"

1da87ee

This reverts commit 3f1ad47.

PartialEq: handle longer transitive chains

a63880c

PartialOrd: transitivity and duality are required only if the corresp…

3e389ef

…onding impls exist

explain what crates should do when adding comparison with foreign types

baaf6d7

feat: add LocalWaker type, ContextBuilder type, and LocalWake trait.

60a0819

perf: move null check from local_wake() to build()

0cb5e2f

refactor: remove in favor of and to make the API infallible.

232cc2b

feat: add try_waker and From<&mut Context> for ContextBuilder to allo…

403718b

…w the extention of contexts by futures

fix: make LocalWake available in targets that don't support atomics b…

2012d4b

…y removing a #[cfg(target_has_atomic = ptr)]

chore: add tracking issue number to local waker feature

0cb7a0a

feat: impl AsRef<LocalWaker> for Waker.

f824373

chore: fix ci failures

093f80b

fix: change issue number of waker_getters from rust-lang#87021 to rus…

ad28f75

…t-lang#96992.

chore: add and !Sync impls for LocalWaker as a stability guarantee.

3e373f5

doc: update thread safety explanation for RawWakerVTable and RawWaker.

a8e71f2

fix: Apply suggestions from code review

c67a446

Co-authored-by: Mark Rousskov <mark.simulacrum@gmail.com>

docs: remove recommendations to use LocalWaker in stable API document…

eccb5e7

…ation

chore: make method order consistent with waker

7c6a9cb

doc: fix some doctests after rebase

180c68b

make matching on NaN a hard error

cda3588

remove illegal_floating_point_literal_pattern lint

1254ee4

add test checking behavior of matching on floats, and NaNs in consts

9f14fc4

Use <T, U> for array/slice equality impls

3f3a153

Makes the trait implementation documentation for arrays and slices appear more consistent.

fix typo

61d1ebe

Co-authored-by: teor <teor@riseup.net>

Remove unused struct

8266657

matthiaskrgr added 3 commits February 5, 2024 11:07

Rollup merge of rust-lang#120657 - mu001999:clean, r=Nilstrieb

13ea09b

Remove unused struct Detected by rust-lang#118257

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 Feb 5, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 5, 2024

bors merged commit 86eaa89 into rust-lang:master Feb 5, 2024

rustbot added this to the 1.78.0 milestone Feb 5, 2024

matthiaskrgr deleted the rollup-spjnpno branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 8 pull requests #120671

Rollup of 8 pull requests #120671

Uh oh!

matthiaskrgr commented Feb 5, 2024

Uh oh!

matthiaskrgr commented Feb 5, 2024

Uh oh!

bors commented Feb 5, 2024

Uh oh!

bors commented Feb 5, 2024

Uh oh!

matthiaskrgr commented Feb 5, 2024

Uh oh!

matthiaskrgr commented Feb 5, 2024

Uh oh!

bors commented Feb 5, 2024

Uh oh!

rust-log-analyzer commented Feb 5, 2024

Uh oh!

bors commented Feb 5, 2024

Uh oh!

rust-timer commented Feb 5, 2024

Uh oh!

rust-timer commented Feb 5, 2024

Uh oh!

Uh oh!

Rollup of 8 pull requests #120671

Rollup of 8 pull requests #120671

Uh oh!

Conversation

matthiaskrgr commented Feb 5, 2024

Uh oh!

matthiaskrgr commented Feb 5, 2024

Uh oh!

bors commented Feb 5, 2024

Uh oh!

bors commented Feb 5, 2024

Uh oh!

matthiaskrgr commented Feb 5, 2024

Uh oh!

matthiaskrgr commented Feb 5, 2024

Uh oh!

bors commented Feb 5, 2024

Uh oh!

rust-log-analyzer commented Feb 5, 2024

Uh oh!

bors commented Feb 5, 2024

Uh oh!

rust-timer commented Feb 5, 2024

Uh oh!

rust-timer commented Feb 5, 2024

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!