-
-
Notifications
You must be signed in to change notification settings - Fork 15.3k
Rustdoc label badge for notable traits #157058
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.
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
Open
ThierryBerger
wants to merge
10
commits into
rust-lang:main
Choose a base branch
from
ThierryBerger:rustdoc_label_trait
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
9ffec13
rustdoc: add #[doc(label_trait)] to render a trait badge
ThierryBerger c354aec
label trait feature now part of notable traits features
ThierryBerger 0126a8a
experiment with oklch, stricter palette
ThierryBerger ebc813b
pr suggestion, cleaner indentation
ThierryBerger ef5716f
use option for href in NotableTraitBadgeVars
ThierryBerger 88c202c
use shared function for passing through the notable trait information.
ThierryBerger 977ed35
use css classes for colors, number down to 6
ThierryBerger 0886603
use u8 for badge color index
ThierryBerger 412812a
use let chains
ThierryBerger f478afa
add more tests about unlinkable private/doc-hidden/undocumented
ThierryBerger File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| #![feature(doc_notable_trait)] | ||
|
|
||
| #[doc(notable_trait)] | ||
| pub trait Spaceship {} |
13 changes: 13 additions & 0 deletions
13
tests/rustdoc-html/notable-trait/notable-trait-badge-generic.rs
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| #![feature(doc_notable_trait)] | ||
| #![crate_name = "foo"] | ||
|
|
||
| #[doc(notable_trait)] | ||
| pub trait Labeled {} | ||
|
|
||
| pub trait Bound {} | ||
|
|
||
| // A conditional impl: the badge is rendered unconditionally even though the | ||
| // impl only holds for `T: Bound`. | ||
| //@ has 'foo/struct.Wrapper.html' '//div[@class="notable-trait-badge-container"]/a[@href="trait.Labeled.html"]' 'Labeled' | ||
| pub struct Wrapper<T>(pub T); | ||
| impl<T: Bound> Labeled for Wrapper<T> {} |
10 changes: 10 additions & 0 deletions
10
tests/rustdoc-html/notable-trait/notable-trait-badge-negative.rs
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| #![feature(doc_notable_trait, negative_impls)] | ||
| #![crate_name = "foo"] | ||
|
|
||
| #[doc(notable_trait)] | ||
| pub trait Labeled {} | ||
|
|
||
| // A negative impl must not produce a badge. | ||
| //@ count 'foo/struct.Neg.html' '//div[@class="notable-trait-badge-container"]' 0 | ||
| pub struct Neg; | ||
| impl !Labeled for Neg {} | ||
|
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe doc hidden, private traits should be tested too? And unlinkable trait but not sure we can emulate an unbuilt doc dependency |
||
16 changes: 16 additions & 0 deletions
16
tests/rustdoc-html/notable-trait/notable-trait-badge-supertrait.rs
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| #![feature(doc_notable_trait)] | ||
| #![crate_name = "foo"] | ||
|
|
||
| #[doc(notable_trait)] | ||
| pub trait Base {} | ||
|
|
||
| pub trait Derived: Base {} | ||
|
|
||
| //@ has 'foo/struct.S.html' | ||
| // Implementing `Derived` requires implementing the notable supertrait `Base`, | ||
| // so its badge shows up. | ||
| //@ count - '//div[@class="notable-trait-badge-container"]/a' 1 | ||
| //@ has - '//div[@class="notable-trait-badge-container"]/a[@href="trait.Base.html"]' 'Base' | ||
| pub struct S; | ||
| impl Base for S {} | ||
| impl Derived for S {} |
17 changes: 17 additions & 0 deletions
17
tests/rustdoc-html/notable-trait/notable-trait-badge-unlinkable-cross-crate.rs
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| //@ aux-build:notable-dep.rs | ||
|
|
||
| #![crate_name = "foo"] | ||
|
|
||
| extern crate notable_dep; | ||
|
|
||
| // A notable trait from a dependency that was compiled but not documented is | ||
| // unlinkable: the badge is still emitted but rendered as plain text. | ||
| use notable_dep::Spaceship; | ||
|
|
||
| //@ has 'foo/struct.Rocket.html' | ||
| // The badge is present... | ||
| //@ has - '//div[@class="notable-trait-badge-container"]/a' 'Spaceship' | ||
| // ...but unlinked: no badge carries an `href`. | ||
| //@ count - '//div[@class="notable-trait-badge-container"]/a[@href]' 0 | ||
| pub struct Rocket; | ||
| impl Spaceship for Rocket {} |
16 changes: 16 additions & 0 deletions
16
tests/rustdoc-html/notable-trait/notable-trait-badge-unlinkable.rs
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| #![feature(doc_notable_trait)] | ||
| #![crate_name = "foo"] | ||
|
|
||
| // Doc-hidden traits don't get badges. | ||
| #[doc(notable_trait)] | ||
| #[doc(hidden)] | ||
| pub trait Hidden {} | ||
|
|
||
| // Private traits don't get badges. | ||
| #[doc(notable_trait)] | ||
| trait Private {} | ||
|
|
||
| //@ count 'foo/struct.Foo.html' '//div[@class="notable-trait-badge-container"]' 0 | ||
| pub struct Foo; | ||
| impl Hidden for Foo {} | ||
| impl Private for Foo {} |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| #![feature(doc_notable_trait)] | ||
| #![crate_name = "foo"] | ||
|
|
||
| #[doc(notable_trait)] | ||
| pub trait Labeled {} | ||
|
|
||
| #[doc(notable_trait)] | ||
| pub trait AlsoLabeled {} | ||
|
|
||
| pub trait Plain {} | ||
|
|
||
| //@ has 'foo/struct.Tagged.html' | ||
| //@ has - '//div[@class="notable-trait-badge-container"]/a[@href="trait.Labeled.html"][@title="foo::Labeled"]' 'Labeled' | ||
| // Badges are sorted by trait name, so `AlsoLabeled` precedes `Labeled`. | ||
| //@ has - '//div[@class="notable-trait-badge-container"]/a[1]' 'AlsoLabeled' | ||
| //@ has - '//div[@class="notable-trait-badge-container"]/a[2]' 'Labeled' | ||
| pub struct Tagged; | ||
| impl Labeled for Tagged {} | ||
| impl AlsoLabeled for Tagged {} | ||
| impl Plain for Tagged {} | ||
|
|
||
| //@ has 'foo/struct.Untagged.html' | ||
| //@ count - '//div[@class="notable-trait-badge-container"]' 0 | ||
| pub struct Untagged; | ||
| impl Plain for Untagged {} |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the trait is not linkable, we should not generate a badge for it (I mentioned that here).
View changes since the review
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it does, yes ; we should probably decide what to do about the notable trait visibility on function return type to align behaviors ? I'd say keep it consistent and then unify behavior on a follow up pr ? But no strong feeling, can do here, I just fear controversial discussions on tangantial changes :p
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Errata: notable traits may be surfaced when the deps are not built ; minimal impact but we should keep option for local builds then.