Skip to content

Rollup of 11 pull requests - #104541

Closed
matthiaskrgr wants to merge 34 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-6q8fij3
Closed

Rollup of 11 pull requests#104541
matthiaskrgr wants to merge 34 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-6q8fij3

Conversation

@matthiaskrgr

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

bentongxyzand others added 30 commits October 19, 2022 20:06
Its name is now not accurate anymore, but we'll adjust that later
Backtraces can very significantly depending on environment and cause
test suite failures spuriously. Ensuring a proper failure-status should
be sufficient to keep a crash properly documented.
Clarify that the diagnostic can be retrieved with `steal_diagnostic`.
Before 7f6ce7d, light-theme where clauses
had color `#4E4C4C` while the main color was `#000`. One of that commit's
simplifications made it so that everything used the same black.
This commit takes advantage of the ability to set [flex-basis] to a specific
length instead of setting it to `auto` and changing min-/max-width, and
setting flex-grow/-shrink both to 0.
[flex-basis]: https://developer.mozilla.org/en-US/docs/Web/CSS/flex-basis
… r=jyn514
Fix `x setup -h -v` should work
r? `@jyn514`
I have to convert profile to path and back in order to remove special-casing in bootstrap. I also check for `dry_run` so that `config.toml` and/ or `.git/hooks/pre-push` will not be created if `--dry-run` is specified.
Please help me see if this is ok, thanks alot!
…impl, r=lcnr
Don't remap early-bound regions for return-position `impl Trait` in trait originating from `impl`
long title 😓
We don't want to remap early-bound regions that originate from the `impl`s themselves, since they have no corresponding region in the trait. Not sure if there's a better condition than checking if the EBR's def-id's parent is the impl -- maybe we should be checking if the region comes from the method or RPITIT... 🤷
r? types
Fixesrust-lang#103850
…heme-choice, r=notriddle
Simplify settings theme choice
I removed the storage changes from rust-lang#98765 and only kept the UI changes.
You can test it [here](https://rustdoc.crud.net/imperio/simplify-settings-theme-choice/foo/index.html).
Discussion about this still in progress [on zulip](https://rust-lang.zulipchat.com/#narrow/stream/266220-rustdoc/topic/Last.20part.20of.20settings.20simplification).
r? `@notriddle`
…mpiler-errors
Fix ICE in in_operand for ty error
Fixesrust-lang#104390
By the way, moving some test cases to proper directory for tidy bless.
…r=compiler-errors
Convert predicates into Predicate in the Obligation constructor
instead of having almost all callers do that.
This reduces a bit of boilerplate, and also paves the way for my work towards rust-lang/compiler-team#531 (as it makes it easier to accept both goals and clauses where right now it only accepts predicates).
…backtraces, r=jackh726
Don't attempt to normalize compiler backtraces
Backtraces can very significantly depending on environment and cause spurious test suite failures. Ensuring a proper failure-status should be sufficient to keep a crash properly documented.
This caused a failure in Fuchsia's test suite CI due to an extra newline between "stack" and "error" appearing after normalization.
cc `@jackh726`
r? `@tmandry`
…er-errors
Edit docs for `rustc_errors::Handler::stash_diagnostic`
Clarify that the diagnostic can be retrieved with `steal_diagnostic`.
r? `@compiler-errors`
…aumeGomez
rustdoc: remove redundant font-color CSS on `.where`
Before 7f6ce7d, light-theme where clauses had color `#4E4C4C` while the main color was `#000`. One of that commit's simplifications made it so that everything used the same black.
Check `dyn*` return type correctly
In `check_fn`, if the declared return type is `dyn Trait`, then we check the return type separately to produce better diagnostics, because this is never valid -- however, when `dyn*` was introduced, this check was never adjusted to only account for *unsized* `dyn Trait` and not *sized* `dyn* Trait`.
Fixesrust-lang#104501
…r=compiler-errors
ICE fixing, remove is_tainted_by_errors since we have ty_error for delay bug
Fixesrust-lang#104510
…ebar-width, r=GuillaumeGomez
rustdoc: clean up sidebar width CSS
This commit takes advantage of the ability to set [flex-basis] to a specific length instead of setting it to `auto` and changing min-/max-width, and setting flex-grow/-shrink both to 0.
This PR should not cause any visual changes.
preview: https://notriddle.com/notriddle-rustdoc-demos/flex-basis-sidebar-width/std/index.html
[flex-basis]: https://developer.mozilla.org/en-US/docs/Web/CSS/flex-basis
@rustbotrustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler 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 Nov 17, 2022
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=11

@bors

bors commented Nov 17, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 540edc7 has been approved by matthiaskrgr

It is now in the queue for this repository.

@borsbors 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 Nov 17, 2022
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job mingw-check failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)
 Compiling globset v0.4.8
Compiling ignore v0.4.18
Compiling xz2 v0.1.6
Compiling toml v0.5.9
error[E0600]: cannot apply unary operator `!` to type `DryRun`
--> setup.rs:161:52
|
161 | } else if stage_dir_exists(&stage_path[..]) && !config.dry_run {
|
|
note: an implementation of `Not` might be missing for `DryRun`
|
|
36 | pub enum DryRun {
| ^^^^^^^^^^^^^^^ must implement `Not`
error[E0600]: cannot apply unary operator `!` to type `DryRun`
--> setup.rs:181:8
|
181 | if !config.dry_run {
|
|
note: an implementation of `Not` might be missing for `DryRun`
|
|
36 | pub enum DryRun {
| ^^^^^^^^^^^^^^^ must implement `Not`
For more information about this error, try `rustc --explain E0600`.
error: could not compile `bootstrap` due to 2 previous errors
failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml

@matthiaskrgr
matthiaskrgr deleted the rollup-6q8fij3 branch December 22, 2022 10:46
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.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-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@rustbot@bentongxyz@compiler-errors@GuillaumeGomez@oli-obk@chenyukang@djkoloski@pierwill@notriddle