nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #57197 - kennytm:rollup, r=kennytm

Browse Source 
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
This commit is contained in:
bors 2018-12-29 18:12:57 +00:00
commit 007115746c
11 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/doc/unstable-book/src/language-features/non-ascii-idents.md
View File

@ -1,8 +1,8 @@
# `non_ascii_idents` # `non_ascii_idents`
The tracking issue for this feature is: [#28979] The tracking issue for this feature is: [#55467]
[#28979]: https://github.com/rust-lang/rust/issues/28979 [#55467]: https://github.com/rust-lang/rust/issues/55467
------------------------ ------------------------

2
src/libcore/pin.rs
View File

@ -25,7 +25,7 @@
//! values. //! values.
//! //!
//! However, these restrictions are usually not necessary. Many types are always freely //! However, these restrictions are usually not necessary. Many types are always freely
//! movable. These types implement the [`Unpin`] auto-trait, which nullifies the affect //! movable. These types implement the [`Unpin`] auto-trait, which nullifies the effect
//! of [`Pin`]. For `T: Unpin`, `Pin<Box<T>>` and `Box<T>` function identically, as do //! of [`Pin`]. For `T: Unpin`, `Pin<Box<T>>` and `Box<T>` function identically, as do
//! `Pin<&mut T>` and `&mut T`. //! `Pin<&mut T>` and `&mut T`.
//! //!

4
src/libcore/ptr.rs
View File

@ -591,7 +591,7 @@ pub unsafe fn read<T>(src: *const T) -> T {
/// whether `T` is [`Copy`]. If `T` is not [`Copy`], using both the returned /// whether `T` is [`Copy`]. If `T` is not [`Copy`], using both the returned
/// value and the value at `*src` can [violate memory safety][read-ownership]. /// value and the value at `*src` can [violate memory safety][read-ownership].
/// ///
/// Note that even if `T` has size `0`, the pointer must be non-NULL and properly aligned. /// Note that even if `T` has size `0`, the pointer must be non-NULL.
/// ///
/// [`Copy`]: ../marker/trait.Copy.html /// [`Copy`]: ../marker/trait.Copy.html
/// [`read`]: ./fn.read.html /// [`read`]: ./fn.read.html
@ -759,7 +759,7 @@ pub unsafe fn write<T>(dst: *mut T, src: T) {
/// ///
/// * `dst` must be [valid] for writes. /// * `dst` must be [valid] for writes.
/// ///
/// Note that even if `T` has size `0`, the pointer must be non-NULL and properly aligned. /// Note that even if `T` has size `0`, the pointer must be non-NULL.
/// ///
/// [valid]: ../ptr/index.html#safety /// [valid]: ../ptr/index.html#safety
/// ///

2
src/librustc_borrowck/borrowck/README.md
View File

@ -3,7 +3,7 @@
> WARNING: This README is more or less obsolete, and will be removed > WARNING: This README is more or less obsolete, and will be removed
> soon! The new system is described in the [rustc guide]. > soon! The new system is described in the [rustc guide].
[rustc guide]: https://rust-lang.github.io/rustc-guide/mir/borrowck.html [rustc guide]: https://rust-lang.github.io/rustc-guide/borrow_check.html
This pass has the job of enforcing memory safety. This is a subtle This pass has the job of enforcing memory safety. This is a subtle
topic. This docs aim to explain both the practice and the theory topic. This docs aim to explain both the practice and the theory

2
src/librustdoc/html/static/down-arrow.svg
View File

@ -1 +1 @@
<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg height="128px" id="Layer_1" style="enable-background:new 0 0 128 128;" version="1.1" viewBox="0 0 128 128" width="128px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g><line style="fill:none;stroke:#2F3435;stroke-width:12;stroke-linecap:square;stroke-miterlimit:10;" x1="111" x2="64" y1="40.5" y2="87.499"/><line style="fill:none;stroke:#2F3435;stroke-width:12;stroke-linecap:square;stroke-miterlimit:10;" x1="64" x2="17" y1="87.499" y2="40.5"/></g></svg> <?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg height="128px" id="Layer_1" style="enable-background:new 0 0 128 128;" version="1.1" viewBox="-30 -20 176 176" width="128px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g><line style="fill:none;stroke:#2F3435;stroke-width:12;stroke-linecap:square;stroke-miterlimit:10;" x1="111" x2="64" y1="40.5" y2="87.499"/><line style="fill:none;stroke:#2F3435;stroke-width:12;stroke-linecap:square;stroke-miterlimit:10;" x1="64" x2="17" y1="87.499" y2="40.5"/></g></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 637 B

After

Width:  |  Height:  |  Size: 641 B

1
src/libstd/lib.rs
View File

@ -248,7 +248,6 @@
#![feature(const_cstr_unchecked)] #![feature(const_cstr_unchecked)]
#![feature(core_intrinsics)] #![feature(core_intrinsics)]
#![feature(dropck_eyepatch)] #![feature(dropck_eyepatch)]
#![cfg_attr(stage0, feature(duration_as_u128))]
#![feature(exact_size_is_empty)] #![feature(exact_size_is_empty)]
#![feature(external_doc)] #![feature(external_doc)]
#![feature(fixed_size_array)] #![feature(fixed_size_array)]

2
src/libstd/primitive_docs.rs
View File

@ -302,7 +302,7 @@ mod prim_never { }
/// ```text /// ```text
/// error: character literal may only contain one codepoint: 'é' /// error: character literal may only contain one codepoint: 'é'
/// let c = 'é'; /// let c = 'é';
/// ^^^^ /// ^^^
/// ``` /// ```
/// ///
/// Another implication of the 4-byte fixed size of a `char` is that /// Another implication of the 4-byte fixed size of a `char` is that

2
src/libsyntax/feature_gate.rs
View File

@ -111,7 +111,7 @@ declare_features! (
(active, concat_idents, "1.0.0", Some(29599), None), (active, concat_idents, "1.0.0", Some(29599), None),
(active, link_args, "1.0.0", Some(29596), None), (active, link_args, "1.0.0", Some(29596), None),
(active, log_syntax, "1.0.0", Some(29598), None), (active, log_syntax, "1.0.0", Some(29598), None),
(active, non_ascii_idents, "1.0.0", Some(28979), None), (active, non_ascii_idents, "1.0.0", Some(55467), None),
(active, plugin_registrar, "1.0.0", Some(29597), None), (active, plugin_registrar, "1.0.0", Some(29597), None),
(active, thread_local, "1.0.0", Some(29594), None), (active, thread_local, "1.0.0", Some(29594), None),
(active, trace_macros, "1.0.0", Some(29598), None), (active, trace_macros, "1.0.0", Some(29598), None),

26
src/test/ui/feature-gates/feature-gate-non_ascii_idents.stderr
View File

@ -1,4 +1,4 @@
error[E0658]: non-ascii idents are not fully supported. (see issue #28979) error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
--> $DIR/feature-gate-non_ascii_idents.rs:1:22 --> $DIR/feature-gate-non_ascii_idents.rs:1:22
| |
LL | extern crate core as bäz; //~ ERROR non-ascii idents LL | extern crate core as bäz; //~ ERROR non-ascii idents
@ -6,7 +6,7 @@ LL | extern crate core as bäz; //~ ERROR non-ascii idents
| |
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
error[E0658]: non-ascii idents are not fully supported. (see issue #28979) error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
--> $DIR/feature-gate-non_ascii_idents.rs:3:5 --> $DIR/feature-gate-non_ascii_idents.rs:3:5
| |
LL | use föö::bar; //~ ERROR non-ascii idents LL | use föö::bar; //~ ERROR non-ascii idents
@ -14,7 +14,7 @@ LL | use föö::bar; //~ ERROR non-ascii idents
| |
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
error[E0658]: non-ascii idents are not fully supported. (see issue #28979) error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
--> $DIR/feature-gate-non_ascii_idents.rs:5:5 --> $DIR/feature-gate-non_ascii_idents.rs:5:5
| |
LL | mod föö { //~ ERROR non-ascii idents LL | mod föö { //~ ERROR non-ascii idents
@ -22,7 +22,7 @@ LL | mod föö { //~ ERROR non-ascii idents
| |
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
error[E0658]: non-ascii idents are not fully supported. (see issue #28979) error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
--> $DIR/feature-gate-non_ascii_idents.rs:9:4 --> $DIR/feature-gate-non_ascii_idents.rs:9:4
| |
LL | fn bär( //~ ERROR non-ascii idents LL | fn bär( //~ ERROR non-ascii idents
@ -30,7 +30,7 @@ LL | fn bär( //~ ERROR non-ascii idents
| |
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
error[E0658]: non-ascii idents are not fully supported. (see issue #28979) error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
--> $DIR/feature-gate-non_ascii_idents.rs:10:5 --> $DIR/feature-gate-non_ascii_idents.rs:10:5
| |
LL | bäz: isize //~ ERROR non-ascii idents LL | bäz: isize //~ ERROR non-ascii idents
@ -38,7 +38,7 @@ LL | bäz: isize //~ ERROR non-ascii idents
| |
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
error[E0658]: non-ascii idents are not fully supported. (see issue #28979) error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
--> $DIR/feature-gate-non_ascii_idents.rs:12:9 --> $DIR/feature-gate-non_ascii_idents.rs:12:9
| |
LL | let _ö: isize; //~ ERROR non-ascii idents LL | let _ö: isize; //~ ERROR non-ascii idents
@ -46,7 +46,7 @@ LL | let _ö: isize; //~ ERROR non-ascii idents
| |
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
error[E0658]: non-ascii idents are not fully supported. (see issue #28979) error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
--> $DIR/feature-gate-non_ascii_idents.rs:15:10 --> $DIR/feature-gate-non_ascii_idents.rs:15:10
| |
LL | (_ä, _) => {} //~ ERROR non-ascii idents LL | (_ä, _) => {} //~ ERROR non-ascii idents
@ -54,7 +54,7 @@ LL | (_ä, _) => {} //~ ERROR non-ascii idents
| |
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
error[E0658]: non-ascii idents are not fully supported. (see issue #28979) error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
--> $DIR/feature-gate-non_ascii_idents.rs:19:8 --> $DIR/feature-gate-non_ascii_idents.rs:19:8
| |
LL | struct Föö { //~ ERROR non-ascii idents LL | struct Föö { //~ ERROR non-ascii idents
@ -62,7 +62,7 @@ LL | struct Föö { //~ ERROR non-ascii idents
| |
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
error[E0658]: non-ascii idents are not fully supported. (see issue #28979) error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
--> $DIR/feature-gate-non_ascii_idents.rs:20:5 --> $DIR/feature-gate-non_ascii_idents.rs:20:5
| |
LL | föö: isize //~ ERROR non-ascii idents LL | föö: isize //~ ERROR non-ascii idents
@ -70,7 +70,7 @@ LL | föö: isize //~ ERROR non-ascii idents
| |
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
error[E0658]: non-ascii idents are not fully supported. (see issue #28979) error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
--> $DIR/feature-gate-non_ascii_idents.rs:23:6 --> $DIR/feature-gate-non_ascii_idents.rs:23:6
| |
LL | enum Bär { //~ ERROR non-ascii idents LL | enum Bär { //~ ERROR non-ascii idents
@ -78,7 +78,7 @@ LL | enum Bär { //~ ERROR non-ascii idents
| |
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
error[E0658]: non-ascii idents are not fully supported. (see issue #28979) error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
--> $DIR/feature-gate-non_ascii_idents.rs:24:5 --> $DIR/feature-gate-non_ascii_idents.rs:24:5
| |
LL | Bäz { //~ ERROR non-ascii idents LL | Bäz { //~ ERROR non-ascii idents
@ -86,7 +86,7 @@ LL | Bäz { //~ ERROR non-ascii idents
| |
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
error[E0658]: non-ascii idents are not fully supported. (see issue #28979) error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
--> $DIR/feature-gate-non_ascii_idents.rs:25:9 --> $DIR/feature-gate-non_ascii_idents.rs:25:9
| |
LL | qüx: isize //~ ERROR non-ascii idents LL | qüx: isize //~ ERROR non-ascii idents
@ -94,7 +94,7 @@ LL | qüx: isize //~ ERROR non-ascii idents
| |
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
error[E0658]: non-ascii idents are not fully supported. (see issue #28979) error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
--> $DIR/feature-gate-non_ascii_idents.rs:30:8 --> $DIR/feature-gate-non_ascii_idents.rs:30:8
| |
LL | fn qüx(); //~ ERROR non-ascii idents LL | fn qüx(); //~ ERROR non-ascii idents

6
src/test/ui/imports/local-modularized-tricky-fail-2.stderr
View File

@ -1,4 +1,4 @@
error[E0658]: non-ascii idents are not fully supported. (see issue #28979) error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
--> $DIR/local-modularized-tricky-fail-2.rs:20:32 --> $DIR/local-modularized-tricky-fail-2.rs:20:32
| |
LL | exported!(); LL | exported!();
@ -9,7 +9,7 @@ LL | () => ( struct Б; ) //~ ERROR non-ascii idents are not ful
| |
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
error[E0658]: non-ascii idents are not fully supported. (see issue #28979) error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
--> $DIR/local-modularized-tricky-fail-2.rs:36:24 --> $DIR/local-modularized-tricky-fail-2.rs:36:24
| |
LL | panic!(); LL | panic!();
@ -20,7 +20,7 @@ LL | () => ( struct Г; ) //~ ERROR non-ascii idents are not fully suppo
| |
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
error[E0658]: non-ascii idents are not fully supported. (see issue #28979) error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
--> $DIR/local-modularized-tricky-fail-2.rs:46:24 --> $DIR/local-modularized-tricky-fail-2.rs:46:24
| |
LL | include!(); LL | include!();

8
src/test/ui/utf8_idents.stderr
View File

@ -1,4 +1,4 @@
error[E0658]: non-ascii idents are not fully supported. (see issue #28979) error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
--> $DIR/utf8_idents.rs:4:5 --> $DIR/utf8_idents.rs:4:5
| |
LL | 'β, //~ ERROR non-ascii idents are not fully supported LL | 'β, //~ ERROR non-ascii idents are not fully supported
@ -6,7 +6,7 @@ LL | 'β, //~ ERROR non-ascii idents are not fully supported
| |
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
error[E0658]: non-ascii idents are not fully supported. (see issue #28979) error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
--> $DIR/utf8_idents.rs:5:5 --> $DIR/utf8_idents.rs:5:5
| |
LL | γ //~ ERROR non-ascii idents are not fully supported LL | γ //~ ERROR non-ascii idents are not fully supported
@ -14,7 +14,7 @@ LL | γ //~ ERROR non-ascii idents are not fully supported
| |
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
error[E0658]: non-ascii idents are not fully supported. (see issue #28979) error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
--> $DIR/utf8_idents.rs:9:5 --> $DIR/utf8_idents.rs:9:5
| |
LL | δ: usize //~ ERROR non-ascii idents are not fully supported LL | δ: usize //~ ERROR non-ascii idents are not fully supported
@ -22,7 +22,7 @@ LL | δ: usize //~ ERROR non-ascii idents are not fully supported
| |
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
error[E0658]: non-ascii idents are not fully supported. (see issue #28979) error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
--> $DIR/utf8_idents.rs:13:9 --> $DIR/utf8_idents.rs:13:9
| |
LL | let α = 0.00001f64; //~ ERROR non-ascii idents are not fully supported LL | let α = 0.00001f64; //~ ERROR non-ascii idents are not fully supported