Skip to content

Commit dd155df

Browse files
committedMar 10, 2020
Auto merge of #69879 - Centril:rollup-ryea91j, r=Centril
Rollup of 10 pull requests Successful merges: - #69475 (Remove the `no_force` query attribute) - #69514 (Remove spotlight) - #69677 (rustc_metadata: Give decoder access to whole crate store) - #69714 (Make PlaceRef take just one lifetime) - #69799 (Allow ZSTs in `AllocRef`) - #69817 (test(patterns): add patterns feature tests to borrowck test suite) - #69836 (Check if output is immediate value) - #69847 (clean up E0393 explanation) - #69861 (Add note about localization to std::fmt docs) - #69877 (Vec::new is const stable in 1.39 not 1.32) Failed merges: r? @ghost
2 parents 3dbade6 + 3e9efbd commit dd155df

File tree

60 files changed

+925
-886
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+925
-886
lines changed
 

‎src/doc/rustdoc/src/unstable-features.md

-21
Original file line numberDiff line numberDiff line change
@@ -138,27 +138,6 @@ Book][unstable-doc-cfg] and [its tracking issue][issue-doc-cfg].
138138
[unstable-doc-cfg]: ../unstable-book/language-features/doc-cfg.html
139139
[issue-doc-cfg]: https://github.com/rust-lang/rust/issues/43781
140140

141-
### Adding your trait to the "Important Traits" dialog
142-
143-
Rustdoc keeps a list of a few traits that are believed to be "fundamental" to a given type when
144-
implemented on it. These traits are intended to be the primary interface for their types, and are
145-
often the only thing available to be documented on their types. For this reason, Rustdoc will track
146-
when a given type implements one of these traits and call special attention to it when a function
147-
returns one of these types. This is the "Important Traits" dialog, visible as a circle-i button next
148-
to the function, which, when clicked, shows the dialog.
149-
150-
In the standard library, the traits that qualify for inclusion are `Iterator`, `io::Read`, and
151-
`io::Write`. However, rather than being implemented as a hard-coded list, these traits have a
152-
special marker attribute on them: `#[doc(spotlight)]`. This means that you could apply this
153-
attribute to your own trait to include it in the "Important Traits" dialog in documentation.
154-
155-
The `#[doc(spotlight)]` attribute currently requires the `#![feature(doc_spotlight)]` feature gate.
156-
For more information, see [its chapter in the Unstable Book][unstable-spotlight] and [its tracking
157-
issue][issue-spotlight].
158-
159-
[unstable-spotlight]: ../unstable-book/language-features/doc-spotlight.html
160-
[issue-spotlight]: https://github.com/rust-lang/rust/issues/45040
161-
162141
### Exclude certain dependencies from documentation
163142

164143
The standard library uses several dependencies which, in turn, use several types and traits from the

‎src/doc/unstable-book/src/language-features/doc-spotlight.md

-30
This file was deleted.

0 commit comments

Comments
 (0)