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 6 pull requests #102896

Merged
merged 13 commits into from
Oct 11, 2022
Merged

Rollup of 6 pull requests #102896

merged 13 commits into from
Oct 11, 2022

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

zertosh and others added 13 commits October 9, 2022 13:51
@zertosh
update to syn-1.0.102
a65ddf0
@SparrowLii
suggest candidates for unresolved import
0571b0a
@compiler-errors
Point out incompatible closure bounds
6934853
@notriddle
rustdoc: clean up overly complex .trait-impl CSS selectors
03fe005 
When added in 4596436, these multi-class
selectors were present in the initial commit, but no reason was given why
the shorter selector wouldn't work.
@jyn514 @estebank
let is not allowed in struct field definitions
6071b4b 
Co-authored-by: jyn514 <[email protected]>
Co-authored-by: Esteban Kuber <[email protected]>
@GuillaumeGomez
Update browser-ui-test version to 0.12.2
c6803fa
@GuillaumeGomez
Simplify result color checks
9c5a769
@matthiaskrgr
Rollup merge of rust-lang#101360 - compiler-errors:multiple-closure-b…
d8d01e3 
…ounds, r=petrochenkov

Point out incompatible closure bounds

Fixes rust-lang#100295
@matthiaskrgr
Rollup merge of rust-lang#101789 - gimbles:let, r=estebank
01a2246 
`let`'s not needed in struct field definitions

Fixes rust-lang#101683
@matthiaskrgr
Rollup merge of rust-lang#102846 - zertosh:update-syn, r=dtolnay
973afb1 
update to syn-1.0.102

This update removes the only `.gitignore` found in `rustc-src`:

    vendor/syn/tests/.gitignore
    vendor/syn-1.0.91/tests/.gitignore
    vendor/syn-1.0.95/tests/.gitignore

To check-in `rustc-src` for hermetic builds in environments with
restrictive `.gitignore` policies, one has to remove these
`tests/.gitignore` and patch the respective
`.cargo-checksum.json`.`syn` >1.0.101 includes dtolnay/syn@3c49303bed7a,
which removes its `tests/.gitignore`. Now the `syn` crates.io package
has no `.gitignore`.

[`rustc-src`'s `vendor`][] is produced from the root `Cargo.toml`,
`src/tools/rust-analyzer/Cargo.toml`,
`compiler/rustc_codegen_cranelift/Cargo.toml`, and
`src/bootstrap/Cargo.toml`. `rustc_codegen_cranelift` does not use
`syn`.

[`rustc-src`'s `vendor`]:
  https://github.com/rust-lang/rust/blob/c0784109daa0/src/bootstrap/dist.rs#L934-L940

This was produced with:

    cargo update --package syn --precise 1.0.102 \

    cargo update --package syn --precise 1.0.102 \
        --manifest-path src/tools/rust-analyzer/Cargo.toml

    cargo update --package syn --precise 1.0.102 \
        --manifest-path src/bootstrap/Cargo.toml
@matthiaskrgr
Rollup merge of rust-lang#102871 - notriddle:notriddle/trait-impl-anc…
40c1410 
…hor, r=GuillaumeGomez

rustdoc: clean up overly complex `.trait-impl` CSS selectors

When added in 4596436, these multi-class selectors were present in the initial commit, but no reason was given why the shorter selector wouldn't work.
@matthiaskrgr
Rollup merge of rust-lang#102876 - SparrowLii:import-candidate, r=fee…
0bd1cba 
…1-dead

suggest candidates for unresolved import

Currently we prompt suggestion of candidates(help notes of `use xxx::yyy`) for names which cannot be resolved, but we don't do that for import statements themselves that couldn't be resolved. It seems reasonable to add candidate help information for these statements as well.
Fixes rust-lang#102711
@matthiaskrgr
Rollup merge of rust-lang#102888 - GuillaumeGomez:improve-search-colo…
a52eba4 
…r-check, r=notriddle

Improve rustdoc-gui search-color test

Thanks to the add of "functions" in `browser-ui-test`, we can start to reduce the size of the scripts. It'll be very useful for all color checks.

r? `@notriddle`
@rustbot rustbot added 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-infra Relevant to the infrastructure 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 Oct 10, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Oct 10, 2022

📌 Commit a52eba4 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 10, 2022
@bors
Copy link
Contributor

bors commented Oct 11, 2022

⌛ Testing commit a52eba4 with merge 518263d...

@bors
Copy link
Contributor

bors commented Oct 11, 2022

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 518263d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 11, 2022
@bors bors merged commit 518263d into rust-lang:master Oct 11, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 11, 2022
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#102888 64218a3d3f42b075ad765bd37780ae7fa4957fb5
#102876 9483282e09e8b7fe25282f64dbd191855e69fbc2
#102871 fb9a7f0f8dc382a06d6c86dfa9df1f7f9778fe30
#102846 e38c6ef088c4e5e9de35a78f562bbd9702a398a5
#101789 b248cc9b1a00ec7a06a2aaeaae6ced46cb0fd4f4
#101360 5df747e721f421c50a166621d3bc22d7f99a3f13

previous master: 36c8e291a6

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@bors bors mentioned this pull request Oct 11, 2022
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (518263d): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean1 range count2
Regressions ❌
(primary)		 0.7% [0.6%, 0.9%] 6
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.7% [0.6%, 0.9%] 6

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.

mean1 range count2
Regressions ❌
(primary)		 2.7% [2.3%, 3.1%] 3
Regressions ❌
(secondary)		 2.4% [1.2%, 4.2%] 35
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -3.4% [-4.3%, -2.5%] 2
All ❌✅ (primary) 2.7% [2.3%, 3.1%] 3

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.

mean1 range count2
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -3.4% [-3.4%, -3.4%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -3.4% [-3.4%, -3.4%] 1

Footnotes

  1. the arithmetic mean of the percent change ↩ ↩2 ↩3

  2. number of relevant changes ↩ ↩2 ↩3

@rustbot rustbot added the perf-regression Performance regression. label Oct 11, 2022
@rylev
Copy link
Member

rylev commented Oct 11, 2022

This looks like noise as the impacted benchmarks saw an immediate reversal of results in the next perf run.

@rustbot labels: perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Oct 11, 2022
@matthiaskrgr matthiaskrgr deleted the rollup-jg5xawz branch December 22, 2022 10:46
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. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. 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-infra Relevant to the infrastructure 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.66.0
Development

Successfully merging this pull request may close these issues.
10 participants
@matthiaskrgr @bors @rust-timer @rylev @rustbot @zertosh @SparrowLii @compiler-errors @notriddle @GuillaumeGomez