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 7 pull requests #109824

Merged
merged 29 commits into from
Mar 31, 2023
Merged

Rollup of 7 pull requests #109824

merged 29 commits into from
Mar 31, 2023

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

GuillaumeGomez and others added 29 commits March 24, 2023 13:41
This makes it possible to make the normalization of the error message
more precise, allowing us to not normalize all notes away.
We can easily pass in the source map.
Rename `with_source_map` as `set_source_map`. Because `with` functions
(e.g. `with_session_globals`, `scoped_tls::ScopedKey::with`) are for
*getting* a value for the duration of a closure, and `set` functions
(e.g. `set_session_globals_then` `scoped_tls::ScopedKey::with`) are for
*setting* a value for the duration of a closure.

Also fix up the comment, which is wrong:
- The bit about `TyCtxt` is wrong.
- `span_debug1` doesn't exist any more.
- There's only one level of fallback, not two.

(This is effectively a follow-up to the changes in rust-lang#93936.)

Also add a comment explaining that `SessionGlobals::source_map` should
only be used when absolutely necessary.
…ion-ambiguous-intra-doc2, r=oli-obk,notriddle

rustdoc: Fix invalid suggestions on ambiguous intra doc links v2

Fixes rust-lang#108653.

This is another approach to fixing the same issue. This time, we keep the computed information around instead of re-computing it.

Strangely enough, the order for ambiguities seem to have been changed. Not an issue but it creates a lot of diff...

So which version do you prefer?

r? `@notriddle`
…error, r=notriddle

Move `doc(primitive)` future incompat warning to `invalid_doc_attributes`

Fixes rust-lang#88070.

It's been a while since this was turned into a "future incompatible lint" so I think we can now turn it into a hard error without problem.

r? `@jyn514`
…avidtwco

Fix subslice capture in closure

Fixes rust-lang#109298 by refining captures in the same way for Subslices and Indexes. The comment `// we never capture this` seems to have been inaccurate, as changing it to an assert causes many test failures

`@rustbot` label +A-closures
fluent_messages macro: don't emit the OS error in a note

This makes it possible to make the normalization of the error message precise, allowing us to not normalize all notes away. See rust-lang#109700 (comment)
…=bjorn3

Source map cleanups

r? `@bjorn3`
…, r=notriddle

rustdoc: Add GUI test for jump to collapsed item

Part of rust-lang#66181.

I updated `browser-ui-test` version because I needed to add a new command `property`: GuillaumeGomez/browser-UI-test#452.

r? `@notriddle`
…camelid

rustdoc-search: update docs for comma in `?` help popover
@rustbot rustbot added the A-rustdoc-json Area: Rustdoc JSON backend label Mar 31, 2023
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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-infra Relevant to the infrastructure 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Mar 31, 2023
@GuillaumeGomez
Copy link
Member Author

@bors r+ p=7 rollup=never

@bors
Copy link
Contributor

bors commented Mar 31, 2023

📌 Commit 083c128 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 Mar 31, 2023
@bors
Copy link
Contributor

bors commented Mar 31, 2023

⌛ Testing commit 083c128 with merge 5e1d329...

@bors
Copy link
Contributor

bors commented Mar 31, 2023

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

1 similar comment
@bors
Copy link
Contributor

bors commented Mar 31, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 31, 2023
@bors bors merged commit 5e1d329 into rust-lang:master Mar 31, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha

previous master: 5e1d3299a2

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

@rustbot rustbot added this to the 1.70.0 milestone Mar 31, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#109820 d55781bce7fd7fdfc901ba0630a44512c3d28b7e
#109818 65335b6948461cf949f0aed184bc80b85601949c
#109805 b03b684baad7f6ad869cf1d390dde916d7a70a8e
#109798 8522706a0530017a6a0980ac826dfaf2ecdeb294
#109680 7ccacbdc7c43bf55535716d3b4bb77369b3af5a1
#109443 d40840caf3be67521cd21a138fe503e3018eb6ef
#109104 7c7ea3bc1e58c5e96db565f7239ad58d3d053a4d

previous master: 7402519c63

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 (5e1d329): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

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

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
1.4% [1.4%, 1.4%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

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)
- - 0
Regressions ❌
(secondary)
1.8% [1.2%, 2.4%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.4% [-3.3%, -0.8%] 7
All ❌✅ (primary) - - 0

Cycles

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

@GuillaumeGomez GuillaumeGomez deleted the rollup-i5r4uts branch April 1, 2023 08:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-rustdoc-json Area: Rustdoc JSON backend A-testsuite Area: The testsuite used to check the correctness of rustc A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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-infra Relevant to the infrastructure 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-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.

8 participants