Skip to content

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Nadrieril and others added 25 commits February 20, 2024 04:45
This makes all bootstrap types except for `Compiler` and
`TargetSelection` `!Copy`. This makes it easier to modify them by adding
!Copy types in the future and comes at no cost of code clarity, the
impls were completely unused.
Closes rust-lang#106421

This was already fixed by
f5d43a0, but now the test cases are
added.
…trieb

Stabilize `cfg_target_abi`

This stabilizes the `cfg` option called `target_abi`:

```rust
#[cfg(target_abi = "eabihf")]
```

Tracking issue: rust-lang#80970

fixes rust-lang#78791
resolves rust-lang#80970
…li-obk

make non-PartialEq-typed consts as patterns a hard error

This lint was introduced in rust-lang#115893, for Rust 1.74, so we just had the third stable release where this is shown as a future-compat lint (which is shown for dependencies). Not a single comment or backreference showed up in the tracking issue, rust-lang#116122. So this seems fairly safe to turn into a hard error.

Of course we should do a crater run first.

This is part of rust-lang#120362.
Closes rust-lang#116122.
Add newtypes for bool fields/params/return types

Fixed all the cases of this found with some simple searches for `*/ bool` and `bool /*`; probably many more
…r=Mark-Simulacrum

Add test cases for inlining compiler-private items

Closes rust-lang#106421

This was already fixed by rust-lang#121218, but now the test cases are added.
pattern_analysis: factor out unspecialization

Just moving a dense bit of logic into its own method.
Prevent cycle in implied predicates computation

Makes rust-lang#65913 from hang -> fail. I believe fail is the correct state for this test to remain for the long term.
Fix sgx unit test compilation

Fixes a compilation error:
```
error[E0583]: file not found for module `tests`
 --> library/std/src/sys/locks/rwlock/sgx.rs:2:1
  |
2 | mod tests;
  | ^^^^^^^^^^
  |
  = help: to create the module `tests`, create file "library/std/src/sys/locks/rwlock/sgx/tests.rs" or "library/std/src/sys/locks/rwlock/sgx/tests/mod.rs"
  = note: if there is a `mod tests` elsewhere in the crate already, import it with `use crate::...` instead

For more information about this error, try `rustc --explain E0583`.
error: could not compile `std` (lib test) due to 1 previous error`
```
When running command:
```
 `TF_BUILD=True RUST_TEST_THREADS=1 ./x.py test --stage 1 "library/std" tests/assembly tests/run-make --target=x86_64-fortanix-unknown-sgx --no-doc --exclude src/tools/linkchecker --exclude src/tools/rust-demangler --no-fail-fast 2>&1
```
The fix is done by moving a file to the location suggested by the compiler.

The issue was introduced by PR: rust-lang#121177
Make most bootstrap step types !Copy

This makes all bootstrap types except for `Compiler` and `TargetSelection` `!Copy`. This makes it easier to modify them by adding !Copy types in the future, something that `@saethlin` has complained about before, and comes at no cost of code clarity, the impls were completely unused.

Making `Compiler` and `TargetSelection` `!Copy` (which would allow getting rid of interning) is highly nontrivial as they are used and copied **all over the place**. This should hopefully get most of the benefits.
…=cjgillot

Don't use `unwrap()` in `ArrayIntoIter` lint when typeck fails

Fixes rust-lang#121532
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Feb 25, 2024
@rustbot rustbot added the rollup A PR which is a rollup label Feb 25, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=9

@bors
Copy link
Collaborator

bors commented Feb 25, 2024

📌 Commit a442388 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors 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 25, 2024
@bors
Copy link
Collaborator

bors commented Feb 25, 2024

⌛ Testing commit a442388 with merge 8c0b1fc...

@bors
Copy link
Collaborator

bors commented Feb 25, 2024

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 8c0b1fc to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 25, 2024
@bors bors merged commit 8c0b1fc into rust-lang:master Feb 25, 2024
@rustbot rustbot added this to the 1.78.0 milestone Feb 25, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#119590 Stabilize cfg_target_abi fd342c168d473d5149adf7018476086e97d846c5 (link)
#120805 make non-PartialEq-typed consts as patterns a hard error f730bb1496e21ff3cf08b6f4b3b9a9370878a214 (link)
#121060 Add newtypes for bool fields/params/return types 53bfafbcf17acaf53912a29bb02ad71063eec6ba (link)
#121284 Add test cases for inlining compiler-private items caf7b195a59249dae758cefce7fd20004cd0d803 (link)
#121324 pattern_analysis: factor out unspecialization ce858262e7000c2c0dc738770de0bc3ab90b185b (link)
#121409 Prevent cycle in implied predicates computation 19257c19c5249f4bb712dfb0842e967c430081da (link)
#121513 Fix sgx unit test compilation 9dee1f05e1724e483edcb31afc6c9a89cf55a405 (link)
#121570 Make most bootstrap step types !Copy e29e0b2e26c1a616a9397e22d07c88148c41ad64 (link)
#121586 Don't use unwrap() in ArrayIntoIter lint when typeck fa… bc80859d153a88f9e36fd852db4530e7195b5ed1 (link)

previous master: 34aab623dd

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
Copy link
Collaborator

Finished benchmarking commit (8c0b1fc): 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
Improvements ✅
(secondary)
-0.4% [-0.5%, -0.2%] 2
All ❌✅ (primary) - - 0

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)
- - 0
Regressions ❌
(secondary)
2.2% [2.2%, 2.2%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

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

Binary size

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

Bootstrap: 651.457s -> 650.73s (-0.11%)
Artifact size: 311.11 MiB -> 311.11 MiB (0.00%)

@matthiaskrgr matthiaskrgr deleted the rollup-8wfhh3v branch March 16, 2024 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.