Skip to content

Rollup of 8 pull requests - #119557

Closed
matthiaskrgr wants to merge 19 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-ef1ienw
Closed

Rollup of 8 pull requests#119557
matthiaskrgr wants to merge 19 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-ef1ienw

Conversation

@matthiaskrgr

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Rajveer100and others added 19 commits December 21, 2023 16:45
It prevents a full rebuild of stage 1 compiler when issuing "x.py test"
with rust.lto != thin-local in config.toml.
Co-authored-by: León Orell Valerian Liehr <me@fmease.dev>
…, r=davidtwco
Switch from using `//~ERROR` annotations with `--error-format` to `error-pattern`
Fixesrust-lang#118752
As noticed by `@jyn514` while working on a patch, tests failed due to `//~ERROR` annotations used in combination with the older `--error-format` which is now `error-pattern`.
…rors
custom mir: make it clear what the return block is
Custom MIR recently got support for specifying the "unwind action", so now there's two things coming after the actual call part of `Call` terminators. That's not very self-explaining so I propose we change the syntax to imitate keyword arguments:
```
Call(popped = Vec::pop(v), ReturnTo(drop), UnwindContinue())
```
Also fix some outdated docs and add some docs to `Call` and `Drop`.
…=fmease
Recover parentheses in range patterns
Before:
```rs
match n {
(0).. => (),
_ => ()
}
```
```
error: expected one of `=>`, `if`, or `|`, found `..`
--> src/lib.rs:3:12
|
3 | (0).. => (),
| ^^ expected one of `=>`, `if`, or `|`
```
After:
```
error: range pattern bounds cannot have parentheses
--> main.rs:3:5
|
3 | (0).. => (),
| ^ ^
|
help: remove these parentheses
|
3 - (0).. => (),
3 + 0.. => (),
|
```
This sets the groundwork for rust-lang#118625, which will extend the recovery to expressions like `(0 + 1)..` where users may tend to add parentheses to avoid dealing with precedence.
---
`@rustbot` label +A-parser +A-patterns +A-diagnostics
…ulacrum
bootstrap: Move -Clto= setting from Rustc::run to rustc_cargo
It prevents a full rebuild of stage 1 compiler when issuing "x.py test" with rust.lto != thin-local in config.toml.
…r=davidtwco
Uplift some miscellaneous coroutine-specific machinery into `check_closure`
This PR uplifts some of the logic in `check_fn` that is specific to checking coroutines, which always flows through `check_closure`.
This is just some miscellaneous clean up that I've wanted to do, especially because I'm poking around this code to make it work for async closures.
don't reexport atomic::ordering via rustc_data_structures, use std import
This looks simpler.
…rait, r=compiler-errors
Don't synthesize host effect args inside trait object types
While we were indeed emitting an error for `~const` & `const` trait bounds in trait object types, we were still synthesizing host effect args for them.
Since we don't record the original trait bound modifiers for dyn-Trait in `hir::TyKind::TraitObject` (unlike we do for let's say impl-Trait, `hir::TyKind::OpaqueTy`), AstConv just assumes `ty::BoundConstness::NotConst` in `conv_object_ty_poly_trait_ref` which given `<host> dyn ~const NonConstTrait` resulted in us not realizing that `~const` was used on a non-const trait which lead to a failed assertion in the end.
Instead of updating `hir::TyKind::TraitObject` to track this kind of information, just strip the user-provided constness (similar to rust-lang#119505).
Fixesrust-lang#119524.
@rustbotrustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-testsuite Area: The testsuite used to check the correctness of rustc 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. rollup A PR which is a rollup labels Jan 3, 2024
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=8

@bors

bors commented Jan 3, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit c5e375c has been approved by matthiaskrgr

It is now in the queue for this repository.

@borsbors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 3, 2024
@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 3, 2024
@bors

bors commented Jan 4, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c5e375c with merge 8d59daf...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 4, 2024
…iaskrgr
Rollup of 8 pull requests
Successful merges:
- rust-lang#119184 (Switch from using `//~ERROR` annotations with `--error-format` to `error-pattern`)
- rust-lang#119325 (custom mir: make it clear what the return block is)
- rust-lang#119391 (Use Result::flatten in catch_with_exit_code)
- rust-lang#119397 (Recover parentheses in range patterns)
- rust-lang#119414 (bootstrap: Move -Clto= setting from Rustc::run to rustc_cargo)
- rust-lang#119417 (Uplift some miscellaneous coroutine-specific machinery into `check_closure`)
- rust-lang#119527 (don't reexport atomic::ordering via rustc_data_structures, use std import)
- rust-lang#119540 (Don't synthesize host effect args inside trait object types)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors

bors commented Jan 4, 2024

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 Jan 4, 2024
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
 Compiling thiserror v1.0.47
error[E0412]: cannot find type `Ordering` in this scope
--> compiler/rustc_data_structures/src/sync.rs:139:35
|
139 | pub fn load(&self, _: Ordering) -> T {
|
help: consider importing one of these items
|
43 + use core::cmp::Ordering;
---
error[E0412]: cannot find type `Ordering` in this scope
--> compiler/rustc_data_structures/src/sync.rs:144:44
|
144 | pub fn store(&self, val: T, _: Ordering) {
|
help: consider importing one of these items
|
43 + use core::cmp::Ordering;
---
error[E0412]: cannot find type `Ordering` in this scope
--> compiler/rustc_data_structures/src/sync.rs:149:43
|
149 | pub fn swap(&self, val: T, _: Ordering) -> T {
|
help: consider importing one of these items
|
43 + use core::cmp::Ordering;
---
error[E0412]: cannot find type `Ordering` in this scope
--> compiler/rustc_data_structures/src/sync.rs:155:50
|
155 | pub fn fetch_or(&self, val: bool, _: Ordering) -> bool {
|
help: consider importing one of these items
|
43 + use core::cmp::Ordering;
---
error[E0412]: cannot find type `Ordering` in this scope
--> compiler/rustc_data_structures/src/sync.rs:160:51
|
160 | pub fn fetch_and(&self, val: bool, _: Ordering) -> bool {
|
help: consider importing one of these items
|
43 + use core::cmp::Ordering;
---
error[E0412]: cannot find type `Ordering` in this scope
--> compiler/rustc_data_structures/src/sync.rs:187:48
|
187 | pub fn fetch_add(&self, val: T, _: Ordering) -> T {
|
help: consider importing one of these items
|
43 + use core::cmp::Ordering;

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-query-systemArea: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html)A-testsuiteArea: The testsuite used to check the correctness of rustcrollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.T-rustdocRelevant 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.

12 participants

@matthiaskrgr@bors@rust-log-analyzer@compiler-errors@rustbot@Rajveer100@RalfJung@DaniPopes@xry111@klensy@fmease@ShE3py