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.

Sign up for GitHub

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

Jump to bottom

Rollup of 4 pull requests #106558

Merged
merged 8 commits into from
Jan 7, 2023
Merged

Rollup of 4 pull requests #106558

merged 8 commits into from
Jan 7, 2023

Conversation

compiler-errors
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 8 commits January 6, 2023 04:09
@compiler-errors
Report WF error for new solver too
a9d093b
@TaKO8Ki
use smaller spans for missing lifetime/generic args
804dea9 
fix rustdoc ui test
@notriddle
rustdoc: remove no-op CSS .rustdoc.source .sidebar { width: 0 }
16a3c80 
This CSS was added in dc2c972,
before 6a5f8b1 when the sidebars
were merged.

Now that they are merged, the source sidebar is being pushed
off-screen anyway, so giving it zero width doesn't do much.
@LingMan
Fix a typo in the explanation of E0588
dc0e420
@compiler-errors
Rollup merge of rust-lang#106525 - compiler-errors:new-solver-wf, r=j…
258257a 
…ackh726

Report WF error for chalk *and* new solver

addressing this nit rust-lang#106385 (comment)

No test yet because new solver is currently unusable, lol

r? `@lcnr`
@compiler-errors
Rollup merge of rust-lang#106533 - TaKO8Ki:use-smaller-span-for-missi…
eeb76eb 
…ng-lifetime/generic-args, r=compiler-errors

Use smaller spans for missing lifetime/generic args

We can remove ident from suggestions.
@compiler-errors
Rollup merge of rust-lang#106543 - notriddle:notriddle/source-sidebar…
64beb04 
…-width-zero, r=GuillaumeGomez

rustdoc: remove no-op CSS `.rustdoc.source .sidebar { width: 0 }`

This CSS was added in dc2c972, before 6a5f8b1 when the sidebars were merged.

Now that they are merged, the source sidebar is being pushed off-screen anyway, so giving it zero width doesn't do much.
@compiler-errors
Rollup merge of rust-lang#106554 - LingMan:explanation_typo, r=compil…
01cb9dc 
…er-errors

Fix a typo in the explanation of E0588
@rustbot rustbot added 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 Jan 7, 2023
@compiler-errors
Copy link
Member Author

@bors r+ rollup=never p=1

@bors
Copy link
Contributor

bors commented Jan 7, 2023

📌 Commit 01cb9dc has been approved by compiler-errors

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

bors commented Jan 7, 2023

⌛ Testing commit 01cb9dc with merge 472651a...

@bors
Copy link
Contributor

bors commented Jan 7, 2023

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 472651a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 7, 2023
@bors bors merged commit 472651a into rust-lang:master Jan 7, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 7, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#106554 9fddb37ca19e98140fd2e6a6fcde8b04391742d5
#106543 9216c23d2c6b300bc36da5c44422985fb52c27e5
#106533 1fc0464c690f56bb9cf273698bed82825d25b4fd
#106525 090309c9a3dcef8fe72f1443e043ac90d1e4ed7f

previous master: 93bf84c902

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

Cycles

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

@compiler-errors compiler-errors deleted the rollup-lkii3j3 branch August 11, 2023 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
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-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
Milestone
1.68.0
Development

Successfully merging this pull request may close these issues.
7 participants
@compiler-errors @bors @rust-timer @rustbot @TaKO8Ki @notriddle @LingMan