Skip to content

Commit 0071157

Browse files
committed
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
2 parents d969c61 + 68f370c commit 0071157

File tree

11 files changed

+29
-30
lines changed

11 files changed

+29
-30
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# `non_ascii_idents`
22

3-
The tracking issue for this feature is: [#28979]
3+
The tracking issue for this feature is: [#55467]
44

5-
[#28979]: https://github.com/rust-lang/rust/issues/28979
5+
[#55467]: https://github.com/rust-lang/rust/issues/55467
66

77
------------------------
88

src/libcore/pin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
//! values.
2626
//!
2727
//! However, these restrictions are usually not necessary. Many types are always freely
28-
//! movable. These types implement the [`Unpin`] auto-trait, which nullifies the affect
28+
//! movable. These types implement the [`Unpin`] auto-trait, which nullifies the effect
2929
//! of [`Pin`]. For `T: Unpin`, `Pin<Box<T>>` and `Box<T>` function identically, as do
3030
//! `Pin<&mut T>` and `&mut T`.
3131
//!

src/libcore/ptr.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ pub unsafe fn read<T>(src: *const T) -> T {
591591
/// whether `T` is [`Copy`]. If `T` is not [`Copy`], using both the returned
592592
/// value and the value at `*src` can [violate memory safety][read-ownership].
593593
///
594-
/// Note that even if `T` has size `0`, the pointer must be non-NULL and properly aligned.
594+
/// Note that even if `T` has size `0`, the pointer must be non-NULL.
595595
///
596596
/// [`Copy`]: ../marker/trait.Copy.html
597597
/// [`read`]: ./fn.read.html
@@ -759,7 +759,7 @@ pub unsafe fn write<T>(dst: *mut T, src: T) {
759759
///
760760
/// * `dst` must be [valid] for writes.
761761
///
762-
/// Note that even if `T` has size `0`, the pointer must be non-NULL and properly aligned.
762+
/// Note that even if `T` has size `0`, the pointer must be non-NULL.
763763
///
764764
/// [valid]: ../ptr/index.html#safety
765765
///

src/librustc_borrowck/borrowck/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
> WARNING: This README is more or less obsolete, and will be removed
44
> soon! The new system is described in the [rustc guide].
55
6-
[rustc guide]: https://rust-lang.github.io/rustc-guide/mir/borrowck.html
6+
[rustc guide]: https://rust-lang.github.io/rustc-guide/borrow_check.html
77

88
This pass has the job of enforcing memory safety. This is a subtle
99
topic. This docs aim to explain both the practice and the theory
+1-1
Loading

src/libstd/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@
248248
#![feature(const_cstr_unchecked)]
249249
#![feature(core_intrinsics)]
250250
#![feature(dropck_eyepatch)]
251-
#![cfg_attr(stage0, feature(duration_as_u128))]
252251
#![feature(exact_size_is_empty)]
253252
#![feature(external_doc)]
254253
#![feature(fixed_size_array)]

src/libstd/primitive_docs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ mod prim_never { }
302302
/// ```text
303303
/// error: character literal may only contain one codepoint: 'é'
304304
/// let c = 'é';
305-
/// ^^^^
305+
/// ^^^
306306
/// ```
307307
///
308308
/// Another implication of the 4-byte fixed size of a `char` is that

src/libsyntax/feature_gate.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ declare_features! (
111111
(active, concat_idents, "1.0.0", Some(29599), None),
112112
(active, link_args, "1.0.0", Some(29596), None),
113113
(active, log_syntax, "1.0.0", Some(29598), None),
114-
(active, non_ascii_idents, "1.0.0", Some(28979), None),
114+
(active, non_ascii_idents, "1.0.0", Some(55467), None),
115115
(active, plugin_registrar, "1.0.0", Some(29597), None),
116116
(active, thread_local, "1.0.0", Some(29594), None),
117117
(active, trace_macros, "1.0.0", Some(29598), None),

src/test/ui/feature-gates/feature-gate-non_ascii_idents.stderr

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,100 @@
1-
error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
1+
error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
22
--> $DIR/feature-gate-non_ascii_idents.rs:1:22
33
|
44
LL | extern crate core as bäz; //~ ERROR non-ascii idents
55
| ^^^
66
|
77
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable
88

9-
error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
9+
error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
1010
--> $DIR/feature-gate-non_ascii_idents.rs:3:5
1111
|
1212
LL | use föö::bar; //~ ERROR non-ascii idents
1313
| ^^^
1414
|
1515
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable
1616

17-
error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
17+
error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
1818
--> $DIR/feature-gate-non_ascii_idents.rs:5:5
1919
|
2020
LL | mod föö { //~ ERROR non-ascii idents
2121
| ^^^
2222
|
2323
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable
2424

25-
error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
25+
error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
2626
--> $DIR/feature-gate-non_ascii_idents.rs:9:4
2727
|
2828
LL | fn bär( //~ ERROR non-ascii idents
2929
| ^^^
3030
|
3131
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable
3232

33-
error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
33+
error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
3434
--> $DIR/feature-gate-non_ascii_idents.rs:10:5
3535
|
3636
LL | bäz: isize //~ ERROR non-ascii idents
3737
| ^^^
3838
|
3939
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable
4040

41-
error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
41+
error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
4242
--> $DIR/feature-gate-non_ascii_idents.rs:12:9
4343
|
4444
LL | let _ö: isize; //~ ERROR non-ascii idents
4545
| ^^
4646
|
4747
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable
4848

49-
error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
49+
error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
5050
--> $DIR/feature-gate-non_ascii_idents.rs:15:10
5151
|
5252
LL | (_ä, _) => {} //~ ERROR non-ascii idents
5353
| ^^
5454
|
5555
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable
5656

57-
error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
57+
error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
5858
--> $DIR/feature-gate-non_ascii_idents.rs:19:8
5959
|
6060
LL | struct Föö { //~ ERROR non-ascii idents
6161
| ^^^
6262
|
6363
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable
6464

65-
error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
65+
error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
6666
--> $DIR/feature-gate-non_ascii_idents.rs:20:5
6767
|
6868
LL | föö: isize //~ ERROR non-ascii idents
6969
| ^^^
7070
|
7171
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable
7272

73-
error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
73+
error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
7474
--> $DIR/feature-gate-non_ascii_idents.rs:23:6
7575
|
7676
LL | enum Bär { //~ ERROR non-ascii idents
7777
| ^^^
7878
|
7979
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable
8080

81-
error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
81+
error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
8282
--> $DIR/feature-gate-non_ascii_idents.rs:24:5
8383
|
8484
LL | Bäz { //~ ERROR non-ascii idents
8585
| ^^^
8686
|
8787
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable
8888

89-
error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
89+
error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
9090
--> $DIR/feature-gate-non_ascii_idents.rs:25:9
9191
|
9292
LL | qüx: isize //~ ERROR non-ascii idents
9393
| ^^^
9494
|
9595
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable
9696

97-
error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
97+
error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
9898
--> $DIR/feature-gate-non_ascii_idents.rs:30:8
9999
|
100100
LL | fn qüx(); //~ ERROR non-ascii idents

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
1+
error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
22
--> $DIR/local-modularized-tricky-fail-2.rs:20:32
33
|
44
LL | exported!();
@@ -9,7 +9,7 @@ LL | () => ( struct Б; ) //~ ERROR non-ascii idents are not ful
99
|
1010
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable
1111

12-
error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
12+
error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
1313
--> $DIR/local-modularized-tricky-fail-2.rs:36:24
1414
|
1515
LL | panic!();
@@ -20,7 +20,7 @@ LL | () => ( struct Г; ) //~ ERROR non-ascii idents are not fully suppo
2020
|
2121
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable
2222

23-
error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
23+
error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
2424
--> $DIR/local-modularized-tricky-fail-2.rs:46:24
2525
|
2626
LL | include!();

src/test/ui/utf8_idents.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
1+
error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
22
--> $DIR/utf8_idents.rs:4:5
33
|
44
LL | 'β, //~ ERROR non-ascii idents are not fully supported
55
| ^^
66
|
77
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable
88

9-
error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
9+
error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
1010
--> $DIR/utf8_idents.rs:5:5
1111
|
1212
LL | γ //~ ERROR non-ascii idents are not fully supported
1313
| ^
1414
|
1515
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable
1616

17-
error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
17+
error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
1818
--> $DIR/utf8_idents.rs:9:5
1919
|
2020
LL | δ: usize //~ ERROR non-ascii idents are not fully supported
2121
| ^
2222
|
2323
= help: add #![feature(non_ascii_idents)] to the crate attributes to enable
2424

25-
error[E0658]: non-ascii idents are not fully supported. (see issue #28979)
25+
error[E0658]: non-ascii idents are not fully supported. (see issue #55467)
2626
--> $DIR/utf8_idents.rs:13:9
2727
|
2828
LL | let α = 0.00001f64; //~ ERROR non-ascii idents are not fully supported

0 commit comments

Comments
 (0)