rustdoc: simplify clean by removing FnRetTy
#112113
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
A-rustdoc-json
|
Some changes occurred in src/librustdoc/clean/types.rs cc @camelid |
This comment has been minimized.
This comment has been minimized.
|
Apart from my nit and the failing CI, looks good to me! 👍 |
The default fn ret ty is always unit. Just use that. Looking back at the time when `FnRetTy` (then called `FunctionRetTy`) was first added to rustdoc, it seems to originally be there because `-> !` was a special form: the never type didn't exist back then. rust-lang@eb01b17#diff-384affc1b4190940f114f3fcebbf969e7e18657a71ef9001da6b223a036687d9L921-L924
notriddle
force-pushed
the
notriddle/rm-fnretty
branch
from
9c87dfa
to
1862fcb
Compare
GuillaumeGomez
approved these changes
May 30, 2023
|
Thanks! r=me once CI pass |
|
@bors r=GuillaumeGomez rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 31, 2023
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#112031 (Migrate `item_proc_macro` to Askama) - rust-lang#112053 (Remove `-Zcgu-partitioning-strategy`.) - rust-lang#112069 (offset_of: don't require type to be `Sized`) - rust-lang#112084 (enhancements on build_helper utilization and rustdoc-gui-test) - rust-lang#112096 (Remove array_zip) - rust-lang#112108 (Fix re-export of doc hidden item inside private item not displayed) - rust-lang#112113 (rustdoc: simplify `clean` by removing `FnRetTy`) r? `@ghost` `@rustbot` modify labels: rollup
fbstj
reviewed
May 31, 2023
| Ok(()) | ||
| } | ||
|
|
||
| pub(crate) fn print_output<'a, 'tcx: 'a>( |
There was a problem hiding this comment.
Suggested change
| pub(crate) fn print_output<'a, 'tcx: 'a>( | |
| fn print_output<'a, 'tcx: 'a>( |
unless I'm being blind this isn't being used anywhere else?
There was a problem hiding this comment.
Good catch! Wanna send a fix? :)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The default fn ret ty is always unit. Just use that.
Looking back at the time when
FnRetTy(then calledFunctionRetTy) was first added to rustdoc, it seems to originally be there because-> !was a special form: the never type didn't exist back then.eb01b17#diff-384affc1b4190940f114f3fcebbf969e7e18657a71ef9001da6b223a036687d9L921-L924
DefaultReturnwas later added to rustdoc to mirror a change in HIR, which added a variant for DefaultReturn because it makesSpanmanagement easier. This isn't needed in rustdoc, since it doesn't carry spans.3f0cc80#diff-384affc1b4190940f114f3fcebbf969e7e18657a71ef9001da6b223a036687d9R1144