Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 5 pull requests #125083

Closed
wants to merge 16 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

fmease and others added 16 commits January 14, 2024 13:48
Modifying an environment variable would make the function unsafe to
call.
…e line

In particular, lifetime-generic associated types often have a
`where Self: 'a` bound, which we can format on the same line.
…-clause-same-line, r=compiler-errors

style-guide: Format single associated type `where` clauses on the same line

In particular, lifetime-generic associated types often have a
`where Self: 'a` bound, which we can format on the same line.
…ert-label, r=apiraino

[meta] Clarify prioritization alert

Apparently, there used to exist the label <kbd>I-nominated</kbd> judging from this entry:

https://github.com/rust-lang/rust/blob/8847bda592d940ae1f34d87d8cacdc09a9f787fa/triagebot.toml#L393

Since it was replaced with individual team labels, I think it makes sense to update the prioritization alert. Of course, it's not super important since the members of WG-prioritization already know that. This is just cleanup.

r? apiraino or wg-prioritization
Stabilize `seek_seek_relative`

This PR stabilizes `seek_seek_relative`:

```rust
// std::io::Seek

trait Seek {
    fn seek_relative(&mut self, offset: i64) -> Result<()>;
}
```

<br>

Tracking issue: rust-lang#117374.
Implementation PR: rust-lang#116750.

FCPs already completed in the tracking issue.

Closes rust-lang#117374.

r? libs-api
…er-errors

elaborate obligations in coherence

The following test currently does not pass coherence:
```rust
trait Super {}
trait Sub<T>: Super {}

trait Overlap<T> {}
impl<T, U: Sub<T>> Overlap<T> for U {}
impl<T> Overlap<T> for () {}

fn main() {}
```

We check whether `(): Sub<?t>` holds. This stalls with ambiguity as downstream crates may add an impl for `(): Sub<Local>`. However, its super trait bound `(): Super` cannot be implemented downstream, so this one is known not to hold.

By elaborating the bounds in the implicit negative overlap check, this now compiles. This is necessary to prevent breakage from enabling `-Znext-solver=coherence` (rust-lang#121848), see tests/ui/coherence/super-traits/super-trait-knowable-2.rs for more details.

r? ``@compiler-errors``
…lwoerister

Don't call `env::set_var` in `rustc_driver::install_ice_hook`

Modifying an environment variable would make the function unsafe to call.
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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-style Relevant to the style team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels May 13, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented May 13, 2024

📌 Commit 963e951 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 May 13, 2024
@bors
Copy link
Contributor

bors commented May 13, 2024

⌛ Testing commit 963e951 with merge efe6849...

bors added a commit to rust-lang-ci/rust that referenced this pull request May 13, 2024
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#119515 (style-guide: Format single associated type `where` clauses on the same line)
 - rust-lang#119959 ([meta] Clarify prioritization alert)
 - rust-lang#123817 (Stabilize `seek_seek_relative`)
 - rust-lang#124532 (elaborate obligations in coherence)
 - rust-lang#125063 (Don't call `env::set_var` in `rustc_driver::install_ice_hook`)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
    |             ------------------------- but the name `max` in the type namespace is also re-exported here
    |
    = note: `#[warn(ambiguous_glob_reexports)]` implied by `#[warn(warnings)]`

error[E0275]: overflow evaluating the requirement `InsertStatement<_, _, _>: query_builder::QueryFragment<Sqlite>`
   = help: consider increasing the recursion limit by adding a `#![recursion_limit = "256"]` attribute to your crate (`diesel`)
   = help: consider increasing the recursion limit by adding a `#![recursion_limit = "256"]` attribute to your crate (`diesel`)
note: required for `debug_query::DebugQuery<'b, InsertStatement<_, _, _>, Sqlite>` to implement `for<'b> std::fmt::Display`
   |
   |
32 | impl<'a, T, DB> Display for DebugQuery<'a, T, DB>
...
...
36 |     T: QueryFragment<DB>,
   |        ----------------- unsatisfied trait bound introduced here
   = note: 125 redundant requirements hidden
   = note: required for `debug_query::DebugQuery<'b, InsertStatement<_, insertable::BatchInsert<'_, _, _>, _>, Sqlite>` to implement `for<'b> std::fmt::Display`
For more information about this error, try `rustc --explain E0275`.
warning: `diesel` (lib) generated 4 warnings
error: could not compile `diesel` (lib) due to 1 previous error; 4 warnings emitted
warning: build failed, waiting for other jobs to finish...
warning: build failed, waiting for other jobs to finish...
warning: `diesel` (lib test) generated 42 warnings (16 duplicates)
error: could not compile `diesel` (lib test) due to 1 previous error; 42 warnings emitted
thread 'main' panicked at src/tools/cargotest/main.rs:124:9:
tests failed for https://github.com/diesel-rs/diesel
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
Build completed unsuccessfully in 0:27:49
make: *** [Makefile:51: check-aux] Error 1
  network time: Mon, 13 May 2024 18:13:15 GMT
##[error]Process completed with exit code 2.
Post job cleanup.

@bors
Copy link
Contributor

bors commented May 13, 2024

💔 Test failed - checks-actions

@bors 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 May 13, 2024
@matthiaskrgr matthiaskrgr deleted the rollup-lfduxod branch September 1, 2024 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup 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-style Relevant to the style team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants