Skip to content

Rollup of 7 pull requests #57197

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

Merged
merged 14 commits into from
Dec 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# `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

------------------------

Expand Down
2 changes: 1 addition & 1 deletion src/libcore/pin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
//! values.
//!
//! 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
//! `Pin<&mut T>` and `&mut T`.
//!
Expand Down
4 changes: 2 additions & 2 deletions src/libcore/ptr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
/// 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
/// [`read`]: ./fn.read.html
Expand Down Expand Up @@ -759,7 +759,7 @@ pub unsafe fn write<T>(dst: *mut T, src: T) {
///
/// * `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
///
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_borrowck/borrowck/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
> WARNING: This README is more or less obsolete, and will be removed
> 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
topic. This docs aim to explain both the practice and the theory
Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/html/static/down-arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion src/libstd/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/primitive_docs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/feature_gate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ declare_features! (
(active, concat_idents, "1.0.0", Some(29599), None),
(active, link_args, "1.0.0", Some(29596), 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, thread_local, "1.0.0", Some(29594), None),
(active, trace_macros, "1.0.0", Some(29598), None),
Expand Down
26 changes: 13 additions & 13 deletions src/test/ui/feature-gates/feature-gate-non_ascii_idents.stderr
Original file line number Diff line number Diff line change
@@ -1,100 +1,100 @@
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
|
LL | extern crate core as bäz; //~ ERROR non-ascii idents
| ^^^
|
= 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
|
LL | use föö::bar; //~ ERROR non-ascii idents
| ^^^
|
= 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
|
LL | mod föö { //~ ERROR non-ascii idents
| ^^^
|
= 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
|
LL | fn bär( //~ ERROR non-ascii idents
| ^^^
|
= 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
|
LL | bäz: isize //~ ERROR non-ascii idents
| ^^^
|
= 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
|
LL | let _ö: isize; //~ ERROR non-ascii idents
| ^^
|
= 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
|
LL | (_ä, _) => {} //~ ERROR non-ascii idents
| ^^
|
= 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
|
LL | struct Föö { //~ ERROR non-ascii idents
| ^^^
|
= 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
|
LL | föö: isize //~ ERROR non-ascii idents
| ^^^
|
= 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
|
LL | enum Bär { //~ ERROR non-ascii idents
| ^^^
|
= 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
|
LL | Bäz { //~ ERROR non-ascii idents
| ^^^
|
= 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
|
LL | qüx: isize //~ ERROR non-ascii idents
| ^^^
|
= 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
|
LL | fn qüx(); //~ ERROR non-ascii idents
Expand Down
6 changes: 3 additions & 3 deletions src/test/ui/imports/local-modularized-tricky-fail-2.stderr
Original file line number Diff line number Diff line change
@@ -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
|
LL | exported!();
Expand All @@ -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

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
|
LL | panic!();
Expand All @@ -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

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
|
LL | include!();
Expand Down
8 changes: 4 additions & 4 deletions src/test/ui/utf8_idents.stderr
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
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
|
LL | 'β, //~ ERROR non-ascii idents are not fully supported
| ^^
|
= 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
|
LL | γ //~ ERROR non-ascii idents are not fully supported
| ^
|
= 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
|
LL | δ: usize //~ ERROR non-ascii idents are not fully supported
| ^
|
= 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
|
LL | let α = 0.00001f64; //~ ERROR non-ascii idents are not fully supported
Expand Down