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 3 pull requests #109936

Closed
wants to merge 6 commits into from
Closed

Rollup of 3 pull requests #109936

wants to merge 6 commits into from

Conversation

aliemjay
Copy link
Member

@aliemjay aliemjay commented Apr 4, 2023

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 6 commits April 3, 2023 21:20
@compiler-errors
Emit feature error for parenthesized generics in associated type bounds
ab0b935
@scottmcm
Doc-comment IndexVec::from_elem and use it in a few more places
5c3e5af
@fmease
rustdoc: escape GAT args in more cases
6567bc9
@aliemjay
Rollup merge of rust-lang#109913 - scottmcm:index-slice, r=WaffleLapkin
68306fc 
Doc-comment  `IndexVec::from_elem` and use it in a few more places

Since this PR is a reply to rust-lang#109819 (comment),
r? `@WaffleLapkin`
@aliemjay
Rollup merge of rust-lang#109914 - compiler-errors:rtn-bad-parens, r=…
9e3103b 
…oli-obk

Emit feature error for parenthesized generics in associated type bounds

We don't actually do AST->HIR lowering with some `-Zunpretty` flags, so it's not correct to just delay a bug instead of emitting a feature error.

Some diagnostics regressed because of the new errors, but oh well. 🤷

Fixes rust-lang#109898
@aliemjay
Rollup merge of rust-lang#109919 - fmease:rustdoc-fix-issue-109488, r…
bb5c182 
…=notriddle

rustdoc: escape GAT args in more cases

Fixes rust-lang#109488.

Previously we printed the *un*escaped form of GAT arguments not only when `f.alternate()` was true but *also* when we failed to compute the URL of the trait associated with the type projection, i.e. when `href(…)` returned an `Err(_)`.

In this PR the argument printing logic is entirely separate from the above link resolution code as it should be.
Further, we now only try to compute the URL if the HTML format was requested with `!f.alternate()`. Before, we would sometimes compute the `href` only to throw it away later.
@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 Apr 4, 2023
@aliemjay
Copy link
Member Author

aliemjay commented Apr 4, 2023

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Apr 4, 2023

📌 Commit bb5c182 has been approved by aliemjay

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

bors commented Apr 4, 2023

⌛ Testing commit bb5c182 with merge c3fda31830aa8a4cb06553db2371d232c939af93...

@bors
Copy link
Contributor

bors commented Apr 4, 2023

☀️ Test successful - checks-actions
Approved by: aliemjay
Pushing c3fda31830aa8a4cb06553db2371d232c939af93 to master...

1 similar comment
@bors
Copy link
Contributor

bors commented Apr 4, 2023

☀️ Test successful - checks-actions
Approved by: aliemjay
Pushing c3fda31830aa8a4cb06553db2371d232c939af93 to master...

@bors bors added merged-by-bors This PR was explicitly merged by bors. labels Apr 4, 2023
@bors
Copy link
Contributor

bors commented Apr 4, 2023

👀 Test was successful, but fast-forwarding failed: 422 Update is not a fast forward

1 similar comment
@bors
Copy link
Contributor

bors commented Apr 4, 2023

👀 Test was successful, but fast-forwarding failed: 422 Update is not a fast forward

@compiler-errors
Copy link
Member

What the heck happened here?

@compiler-errors
Copy link
Member

Looks like the auto-merge raced with #109917 closing -- this one started testing at 6:27 AM PST, and #109917 merged at 6:27 AM PST, so perhaps there was a delay in github repo state and the merge was made off of the wrong base?

@compiler-errors compiler-errors removed the merged-by-bors This PR was explicitly merged by bors. label Apr 4, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (c3fda31830aa8a4cb06553db2371d232c939af93): 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
Improvements ✅
(secondary)		 -0.3% [-0.3%, -0.3%] 2
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)		 - - 0
Improvements ✅
(primary)		 -2.5% [-2.9%, -2.0%] 2
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -2.5% [-2.9%, -2.0%] 2

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)		 -2.5% [-3.1%, -1.9%] 4
All ❌✅ (primary) - - 0

@aliemjay aliemjay deleted the rollup-nd6m3l9 branch April 5, 2023 01:28
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
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
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@aliemjay @bors @compiler-errors @rust-timer @rustbot @scottmcm @fmease