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

rustdoc: do not mark the contents of a skipped module as inlined #100207

Merged
merged 1 commit into from
Aug 8, 2022
Merged

rustdoc: do not mark the contents of a skipped module as inlined #100207

merged 1 commit into from
Aug 8, 2022

Conversation

notriddle
Copy link
Contributor

Fixes #100204

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

r? @jsha

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 6, 2022
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Aug 6, 2022
Closed
@Mark-Simulacrum
Copy link
Member

It would be great to get a quick review here, in case we decide to backport this into 1.63 beta (shipping as stable this upcoming Thursday). cc @rust-lang/rustdoc

It would also be good for comments on whether it makes sense to backport this or instead drop #99738 from 1.63 -- see my comments on the issue #100204 (comment)

@Manishearth
Copy link
Member

@bors r+

I think backporting this should be fine? Unsure.

@bors
Copy link
Contributor

bors commented Aug 7, 2022

📌 Commit 2289955 has been approved by Manishearth

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 Aug 7, 2022
@Mark-Simulacrum
Copy link
Member

@bors p=1 -- would like to get this landed and out on nightly quickly for any extra testing that'll give us

@Mark-Simulacrum Mark-Simulacrum added beta-nominated Nominated for backporting to the compiler in the beta channel. beta-accepted Accepted for backporting to the compiler in the beta channel. labels Aug 7, 2022
@bors
Copy link
Contributor

bors commented Aug 8, 2022

⌛ Testing commit 2289955 with merge fb74b0bb979e91ea449358a8d04feded9baa4711...

@bors
Copy link
Contributor

bors commented Aug 8, 2022

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 8, 2022
@camelid
Copy link
Member

camelid commented Aug 8, 2022

@bors retry x64-msvc timed out

@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 Aug 8, 2022
@bors
Copy link
Contributor

bors commented Aug 8, 2022

⌛ Testing commit 2289955 with merge 6a11cad...

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors
Copy link
Contributor

bors commented Aug 8, 2022

☀️ Test successful - checks-actions
Approved by: Manishearth
Pushing 6a11cad to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 8, 2022
@bors bors merged commit 6a11cad into rust-lang:master Aug 8, 2022
@rustbot rustbot added this to the 1.65.0 milestone Aug 8, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (6a11cad): comparison url.

Instruction count

  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: mixed results
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 1.2% 1.4% 5
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 -1.2% -1.2% 1
All 😿🎉 (primary) N/A N/A 0

Max RSS (memory usage)

Results
  • Primary benchmarks: 🎉 relevant improvement found
  • Secondary benchmarks: no relevant changes found
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 N/A N/A 0
Improvements 🎉
(primary)		 -5.9% -5.9% 1
Improvements 🎉
(secondary)		 N/A N/A 0
All 😿🎉 (primary) -5.9% -5.9% 1

Cycles

Results
  • Primary benchmarks: 🎉 relevant improvement found
  • Secondary benchmarks: 😿 relevant regressions found
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 3.6% 4.4% 2
Improvements 🎉
(primary)		 -9.4% -9.4% 1
Improvements 🎉
(secondary)		 N/A N/A 0
All 😿🎉 (primary) -9.4% -9.4% 1

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

@Mark-Simulacrum Mark-Simulacrum removed this from the 1.65.0 milestone Aug 8, 2022
@Mark-Simulacrum Mark-Simulacrum added this to the 1.63.0 milestone Aug 8, 2022
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Aug 8, 2022
Merged
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 8, 2022
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Aug 8, 2022
Merged
@notriddle notriddle deleted the notriddle/skipped-inline-module branch August 8, 2022 13:57
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 8, 2022
@bors
Auto merge of rust-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 of rust-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`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jsha jsha

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.63.0
Development

Successfully merging this pull request may close these issues.

Docs regression on crate teloxide-0.10.1
10 participants
@notriddle @rust-highfive @Mark-Simulacrum @Manishearth @bors @camelid @rust-log-analyzer @rust-timer @jsha @rustbot