Skip to content

Rollup of 6 pull requests #109668

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 15 commits into from
Mar 27, 2023
Merged

Rollup of 6 pull requests #109668

merged 15 commits into from
Mar 27, 2023

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Swatinem and others added 15 commits March 19, 2023 19:01
…rt-intra-doc-ice, r=petrochenkov

rustdoc: Fix ICE for intra-doc link on intermediate re-export

Fixes rust-lang#109282.

This PR is based on rust-lang#109266 as it includes its commit to make this work.

`@petrochenkov:` It was exactly as you predicted, adding the `DefId` to the attributes fixed the error for intermediate re-exports as well. Thanks a lot!

r? `@petrochenkov`
…errors

Remove the `NodeId` of `ast::ExprKind::Async`

This is a followup to rust-lang#104833 (review).

In my original attempt, I was using `LoweringContext::expr`, which was not correct as it creates a fresh `DefId`.
It now uses the correct `DefId` for the wrapping `Expr`, and also makes forwarding `#[track_caller]` attributes more explicit.
…anonur

Allow passing the --nocapture flag to compiletest

closes rust-lang#109407
…ve, r=Mark-Simulacrum

bump `askama_derive` to 0.12.1

Which uses syn 2.0.

cc rust-lang#109302
Add missing needs-asm-support annotation to ui/simple_global_asm.rs
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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-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 27, 2023
@GuillaumeGomez
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Collaborator

bors commented Mar 27, 2023

📌 Commit c0dec2b 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 27, 2023
@bors
Copy link
Collaborator

bors commented Mar 27, 2023

⌛ Testing commit c0dec2b with merge 2036fdd...

@bors
Copy link
Collaborator

bors commented Mar 27, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 27, 2023
@bors bors merged commit 2036fdd into rust-lang:master Mar 27, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 27, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#109666 971fd65f7b02c79b97def8730c27c37ee1834abb
#109637 9d27a8ae42fb73997008c7afbc9185e7f9372851
#109512 f6313f5f5ad885ae03266d14a44a5b44a02c3505
#109445 230be54d1afb0387e50d200978b1dcab19f17c37
#109354 11ee554be343db73d50533e1fafa967e0dc16367
#109330 1588d70295328dc6c829873d8ad721bfc9a3f412

previous master: dd19135b04

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 (2036fdd): comparison URL.

Overall result: ✅ improvements - 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)
- - 0
Improvements ✅
(primary)
-0.7% [-0.7%, -0.7%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.7% [-0.7%, -0.7%] 1

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)
1.8% [1.3%, 2.4%] 5
Regressions ❌
(secondary)
4.8% [4.8%, 4.8%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.8% [1.3%, 2.4%] 5

Cycles

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

@GuillaumeGomez GuillaumeGomez deleted the rollup-j01if4b branch March 28, 2023 08:20
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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-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.

9 participants