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 9 pull requests #112415

Merged
merged 18 commits into from
Jun 8, 2023
Merged

Rollup of 9 pull requests #112415

merged 18 commits into from
Jun 8, 2023

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

tamird and others added 18 commits June 1, 2023 13:07
Added in 12ac719, this logic always
passed --cpu-features, even when the value was the empty string.
replace build with check

Co-authored-by: Michael Goulet <michael@errs.io>

use appropriate test name
Migrate item_opaque_type to Askama

Fix wrap_item parameters

Fix to write
…laumeGomez

Migrate `item_opaque_ty` to Askama

This PR migrates `item_opaque_ty` to Askama

Refers: rust-lang#108868
…trochenkov

Avoid passing --cpu-features when empty

Added in 12ac719, this logic always
passed --cpu-features, even when the value was the empty string.
…rtlarsan68

bootstrap: remove dependency `is-terminal`
…lor-12, r=notriddle

Migrate GUI colors test to original CSS color format

Follow-up of rust-lang#111459.

r? `@notriddle`
…errors

Fix ICE for while loop with assignment condition with LHS place expr

Fixes rust-lang#112385.
…henkov

Remove accidental comment

Left this in in rust-lang#110092 while debugging, thanks to `@WaffleLapkin` for spotting
…s, r=compiler-errors

Track more diagnostics in `rustc_expand`

I wish we could lint this somehow...
…=Nilstrieb

Don't `use compile_error as print`

I've spent **1.5 hours** debugging this while trying to compile rust-lang#112400, if we use `compile_error!`, we should not just forward user input to it, but issue a reasonable error message.

The better solution would be to use a lint like `clippy::print_stdout`, but since we don't have clippy in CI, let's at least make the macro error better.

Also note that some functions called here actually do use `println` (see for example `print_type_sizes` function).
@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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jun 8, 2023
@GuillaumeGomez
Copy link
Member Author

@bors r+ p=9 rollup=never

@bors
Copy link
Contributor

bors commented Jun 8, 2023

📌 Commit cf5e0b0 has been approved by GuillaumeGomez

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 Jun 8, 2023
@bors
Copy link
Contributor

bors commented Jun 8, 2023

⌛ Testing commit cf5e0b0 with merge e740925...

@bors
Copy link
Contributor

bors commented Jun 8, 2023

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing e740925 to master...

1 similar comment
@bors
Copy link
Contributor

bors commented Jun 8, 2023

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing e740925 to master...

@bors bors added merged-by-bors This PR was explicitly merged by bors. labels Jun 8, 2023
@bors bors merged commit e740925 into rust-lang:master Jun 8, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 8, 2023
@GuillaumeGomez GuillaumeGomez deleted the rollup-5pa9frd branch June 8, 2023 14:42
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (e740925): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

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)
6.6% [6.6%, 6.6%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.8% [-6.0%, -0.5%] 7
Improvements ✅
(secondary)
-1.9% [-2.1%, -1.8%] 2
All ❌✅ (primary) -1.6% [-6.0%, 6.6%] 8

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: 648.385s -> 648.715s (0.05%)

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-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.