Skip to content

Avoid ICE in rustdoc when using Fn bounds - #100205

Merged
bors merged 3 commits into
rust-lang:masterfrom
cjgillot:noice-doc
Aug 9, 2022
Merged

Avoid ICE in rustdoc when using Fn bounds#100205
bors merged 3 commits into
rust-lang:masterfrom
cjgillot:noice-doc

Conversation

@cjgillot

@cjgillotcjgillot commented Aug 6, 2022

Copy link
Copy Markdown
Contributor

Fixes#100143

@rustbotrustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Aug 6, 2022
@rust-highfive

rust-highfive commented Aug 6, 2022

Copy link
Copy Markdown
Contributor

r? @notriddle

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 6, 2022
camelid
camelid requested changes Aug 8, 2022
View reviewed changes
Comment threadsrc/test/rustdoc/fn-bound.rs
Comment threadsrc/librustdoc/clean/auto_trait.rs Outdated
@camelidcamelid assigned camelid and unassigned notriddleAug 8, 2022
@camelidcamelid added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 8, 2022
camelid
camelid approved these changes Aug 8, 2022
View reviewed changes

@camelidcamelid left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@camelid

camelid commented Aug 8, 2022

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Aug 8, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit eab3b05 has been approved by camelid

It is now in the queue for this repository.

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 8, 2022
@camelidcamelid added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 8, 2022
@camelid

camelid commented Aug 8, 2022

Copy link
Copy Markdown
Member

cc @rust-lang/rustdoc

This fixes a pretty severe beta regression.

@camelid

camelid commented Aug 8, 2022

Copy link
Copy Markdown
Member

Actually, this beta is about to be released as 1.63. @Mark-Simulacrum is it too late to get this in 1.63?

@camelid

camelid commented Aug 8, 2022

Copy link
Copy Markdown
Member

@bors p=1

GuillaumeGomez
GuillaumeGomez reviewed Aug 8, 2022
View reviewed changes
Comment threadsrc/test/rustdoc/fn-bound.rs
@camelid

camelid commented Aug 8, 2022

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Aug 8, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 28e4b9e has been approved by camelid

It is now in the queue for this repository.

@camelidcamelid added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Aug 8, 2022
@camelid

camelid commented Aug 8, 2022

Copy link
Copy Markdown
Member

Unilaterally marking as beta-accepted since it's a pretty small change to fix a severe issue and the release is being cut imminently.

@Mark-SimulacrumMark-Simulacrum mentioned this pull request Aug 8, 2022
Merged
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Aug 8, 2022
Merged
@Mark-SimulacrumMark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 8, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 8, 2022
@bors
Auto merge ofrust-lang#100273- Mark-Simulacrum:stable-next, r=Mark-…
4b91a6e
…Simulacrum
[stable] 1.63.0 release
Includes cherry picks of:
* rust-lang#100207
* rust-lang/rust-clippy#9302
* Avoid ICE in rustdoc when using Fn bounds rust-lang#100205
r? `@Mark-Simulacrum`
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 9, 2022
@bors
Auto merge ofrust-lang#100274- Mark-Simulacrum:beta-next, r=Mark-Si…
56714e5
…mulacrum
[beta] 1.64.0 branching
Includes cherry picks of:
* rust-lang#100207
* rust-lang/rust-clippy#9302
* rust-lang/rust@49b1904 (explicit_auto_deref into nursery)
* Avoid ICE in rustdoc when using Fn bounds rust-lang#100205
r? `@Mark-Simulacrum`
@bors

bors commented Aug 9, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 28e4b9e with merge 8d1fa71...

@bors

bors commented Aug 9, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: camelid
Pushing 8d1fa71 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Aug 9, 2022
@bors
bors merged commit 8d1fa71 into rust-lang:masterAug 9, 2022
@rustbotrustbot added this to the 1.65.0 milestone Aug 9, 2022
@rust-timer

rust-timer commented Aug 9, 2022

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (8d1fa71): comparison url.

Instruction count

  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 😿 relevant regressions found
mean1maxcount2
Regressions 😿
(primary)		N/AN/A0
Regressions 😿
(secondary)		1.3%1.4%6
Improvements 🎉
(primary)		N/AN/A0
Improvements 🎉
(secondary)		N/AN/A0
All 😿🎉 (primary)N/AN/A0

Max RSS (memory usage)

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 🎉 relevant improvements found
mean1maxcount2
Regressions 😿
(primary)		N/AN/A0
Regressions 😿
(secondary)		N/AN/A0
Improvements 🎉
(primary)		N/AN/A0
Improvements 🎉
(secondary)		-1.9%-2.0%3
All 😿🎉 (primary)N/AN/A0

Cycles

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 😿 relevant regression found
mean1maxcount2
Regressions 😿
(primary)		N/AN/A0
Regressions 😿
(secondary)		4.1%4.1%1
Improvements 🎉
(primary)		N/AN/A0
Improvements 🎉
(secondary)		N/AN/A0
All 😿🎉 (primary)N/AN/A0

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Footnotes

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

  2. number of relevant changes↩↩2↩3

@cjgillot
cjgillot deleted the noice-doc branch August 9, 2022 16:14
@lqdlqd mentioned this pull request Aug 17, 2023
Closed
@Jules-BertholetJules-Bertholet mentioned this pull request Dec 12, 2023
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GuillaumeGomezGuillaumeGomezGuillaumeGomez left review comments
@camelidcamelidcamelid approved these changes

Assignees

@camelidcamelid

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.65.0

Development

Successfully merging this pull request may close these issues.

ICE in rustdoc: 'called Option::unwrap() on a None value', src/librustdoc/clean/auto_trait.rs:356:26

9 participants

@cjgillot@rust-highfive@camelid@bors@rust-timer@GuillaumeGomez@notriddle@Mark-Simulacrum@rustbot