diff options
| author | bors <bors@rust-lang.org> | 2020-10-24 16:12:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-10-24 16:12:01 +0000 |
| commit | 89fdb30892dbe330730ad1a1c1fe45b9046c2973 (patch) | |
| tree | 351f7a2136b66d2a5abfa16a94c969c33fadf24b /library/std | |
| parent | 2e8a54af60df63034e41359acfc923e5c5769a91 (diff) | |
| parent | 1ac137be93feb476ab14b9d9924c880a53cc3b91 (diff) | |
Auto merge of #78319 - jonas-schievink:rollup-vzj8a6l, r=jonas-schievink
Rollup of 15 pull requests Successful merges: - #76649 (Add a spin loop hint for Arc::downgrade) - #77392 (add `insert` to `Option`) - #77716 (Revert "Allow dynamic linking for iOS/tvOS targets.") - #78109 (Check for exhaustion in RangeInclusive::contains and slicing) - #78198 (Simplify assert terminator only if condition evaluates to expected value) - #78243 (--test-args flag description) - #78249 (improve const infer error) - #78250 (Document inline-const) - #78264 (Add regression test for issue-77475) - #78274 (Update description of Empty Enum for accuracy) - #78278 (move `visit_predicate` into `TypeVisitor`) - #78292 (Loop instead of recursion) - #78293 (Always store Rustdoc theme when it's changed) - #78300 (Make codegen coverage_context optional, and check) - #78307 (Revert "Set .llvmbc and .llvmcmd sections as allocatable") Failed merges: r? `@ghost`
Diffstat (limited to 'library/std')
| -rw-r--r-- | library/std/src/keyword_docs.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/library/std/src/keyword_docs.rs b/library/std/src/keyword_docs.rs index a4bbb18da59..9b704ee9eca 100644 --- a/library/std/src/keyword_docs.rs +++ b/library/std/src/keyword_docs.rs @@ -346,7 +346,7 @@ mod else_keyword {} /// When data follows along with a variant, such as with rust's built-in [`Option`] type, the data /// is added as the type describes, for example `Option::Some(123)`. The same follows with /// struct-like variants, with things looking like `ComplexEnum::LotsOfThings { usual_struct_stuff: -/// true, blah: "hello!".to_string(), }`. Empty Enums are similar to () in that they cannot be +/// true, blah: "hello!".to_string(), }`. Empty Enums are similar to [`!`] in that they cannot be /// instantiated at all, and are used mainly to mess with the type system in interesting ways. /// /// For more information, take a look at the [Rust Book] or the [Reference] @@ -354,6 +354,7 @@ mod else_keyword {} /// [ADT]: https://en.wikipedia.org/wiki/Algebraic_data_type /// [Rust Book]: ../book/ch06-01-defining-an-enum.html /// [Reference]: ../reference/items/enumerations.html +/// [`!`]: primitive.never.html mod enum_keyword {} #[doc(keyword = "extern")] |