diff options
| author | bors <bors@rust-lang.org> | 2018-12-29 18:12:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-29 18:12:57 +0000 |
| commit | 007115746c6d0234742719dd67efba054abe97ce (patch) | |
| tree | 2747628993f65d132462cee937827bc9054d8580 /src/libstd | |
| parent | d969c61e8c8be5b54fd96b7c3bc40cb9b3ace3c2 (diff) | |
| parent | 68f370ce05405b73b7240d9eb25f23a4209687e2 (diff) | |
| download | rust-007115746c6d0234742719dd67efba054abe97ce.tar.gz rust-007115746c6d0234742719dd67efba054abe97ce.zip | |
Auto merge of #57197 - kennytm:rollup, r=kennytm
Rollup of 7 pull requests Successful merges: - #57149 (Fix typo in pin documentation) - #57153 (Small: Fix span in char documentation) - #57159 (Update references to closed issue) - #57163 (Give the crate select chevron room to breathe.) - #57168 (Removed aligned ZST requirement from docs of read_/write_unaligned.) - #57174 (Update link to rustc guide) - #57177 (Fix warning when compiling rustc) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 1 | ||||
| -rw-r--r-- | src/libstd/primitive_docs.rs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index aa4278a8799..6ded43dfed1 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -248,7 +248,6 @@ #![feature(const_cstr_unchecked)] #![feature(core_intrinsics)] #![feature(dropck_eyepatch)] -#![cfg_attr(stage0, feature(duration_as_u128))] #![feature(exact_size_is_empty)] #![feature(external_doc)] #![feature(fixed_size_array)] diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs index 27e720533b2..7755d9339e6 100644 --- a/src/libstd/primitive_docs.rs +++ b/src/libstd/primitive_docs.rs @@ -302,7 +302,7 @@ mod prim_never { } /// ```text /// error: character literal may only contain one codepoint: 'é' /// let c = 'é'; -/// ^^^^ +/// ^^^ /// ``` /// /// Another implication of the 4-byte fixed size of a `char` is that |