Skip to content

Commit f33946f

Browse files
committed
Auto merge of #55289 - pietroalbini:beta-backports, r=pietroalbini
[beta] Rollup backports Merged and approved: * #55231: pick a reference issue for absolute-paths future incompatibility info * #55224: Use a keyword in raw identifier example r? @ghost
2 parents 777a59a + 28db663 commit f33946f

9 files changed

+20
-20
lines changed

RELEASES.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Language
77
more powerful code generation, there is a [new chapter available][proc-macros]
88
in Rust Programming Language book that goes further in depth.
99
- [You can now use keywords as identifiers using the raw identifiers
10-
syntax (`r#`).][53236] e.g. `let r#bool = true;`
10+
syntax (`r#`).][53236] e.g. `let r#for = true;`
1111
- [Using anonymous parameters in traits is now deprecated with a warning and
1212
will be a hard error in the 2018 edition.][53272]
1313
- [You can now use `crate` in paths.][54404] This allows you to refer to the

src/librustc_lint/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) {
313313
},
314314
FutureIncompatibleInfo {
315315
id: LintId::of(ABSOLUTE_PATHS_NOT_STARTING_WITH_CRATE),
316-
reference: "issue TBD",
316+
reference: "issue #53130 <https://github.com/rust-lang/rust/issues/53130>",
317317
edition: Some(Edition::Edition2018),
318318
},
319319
FutureIncompatibleInfo {

src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LL | #![warn(rust_2018_compatibility)]
1111
| ^^^^^^^^^^^^^^^^^^^^^^^
1212
= note: #[warn(absolute_paths_not_starting_with_crate)] implied by #[warn(rust_2018_compatibility)]
1313
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
14-
= note: for more information, see issue TBD
14+
= note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
1515

1616
warning: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition
1717
--> $DIR/suggestions-not-always-applicable.rs:27:5
@@ -20,5 +20,5 @@ LL | #[foo] //~ WARN: absolute paths must start with
2020
| ^^^^^^
2121
|
2222
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
23-
= note: for more information, see issue TBD
23+
= note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
2424

src/test/ui/rust-2018/edition-lint-fully-qualified-paths.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ note: lint level defined here
1010
LL | #![deny(absolute_paths_not_starting_with_crate)]
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1212
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
13-
= note: for more information, see issue TBD
13+
= note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
1414

1515
error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition
1616
--> $DIR/edition-lint-fully-qualified-paths.rs:34:13
@@ -19,7 +19,7 @@ LL | let _: <::foo::Baz as foo::Foo>::Bar = ();
1919
| ^^^^^^^^^^ help: use `crate`: `crate::foo::Baz`
2020
|
2121
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
22-
= note: for more information, see issue TBD
22+
= note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
2323

2424
error: aborting due to 2 previous errors
2525

src/test/ui/rust-2018/edition-lint-nested-empty-paths.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ note: lint level defined here
1010
LL | #![deny(absolute_paths_not_starting_with_crate)]
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1212
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
13-
= note: for more information, see issue TBD
13+
= note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
1414

1515
error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition
1616
--> $DIR/edition-lint-nested-empty-paths.rs:31:5
@@ -19,7 +19,7 @@ LL | use foo::{bar::{XX, baz::{}}};
1919
| ^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `crate`: `crate::foo::{bar::{XX, baz::{}}}`
2020
|
2121
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
22-
= note: for more information, see issue TBD
22+
= note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
2323

2424
error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition
2525
--> $DIR/edition-lint-nested-empty-paths.rs:35:5
@@ -28,7 +28,7 @@ LL | use foo::{bar::{baz::{}, baz1::{}}};
2828
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `crate`: `crate::foo::{bar::{baz::{}, baz1::{}}}`
2929
|
3030
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
31-
= note: for more information, see issue TBD
31+
= note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
3232

3333
error: aborting due to 3 previous errors
3434

src/test/ui/rust-2018/edition-lint-nested-paths.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ note: lint level defined here
1010
LL | #![deny(absolute_paths_not_starting_with_crate)]
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1212
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
13-
= note: for more information, see issue TBD
13+
= note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
1414

1515
error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition
1616
--> $DIR/edition-lint-nested-paths.rs:31:13
@@ -19,7 +19,7 @@ LL | use foo::{self as x, c};
1919
| ^^^^^^^^^^^^^^^^^^^ help: use `crate`: `crate::foo::{self as x, c}`
2020
|
2121
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
22-
= note: for more information, see issue TBD
22+
= note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
2323

2424
error: aborting due to 2 previous errors
2525

src/test/ui/rust-2018/edition-lint-paths.stderr

+7-7
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ note: lint level defined here
1010
LL | #![deny(absolute_paths_not_starting_with_crate)]
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1212
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
13-
= note: for more information, see issue TBD
13+
= note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
1414

1515
error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition
1616
--> $DIR/edition-lint-paths.rs:28:9
@@ -19,7 +19,7 @@ LL | use bar;
1919
| ^^^ help: use `crate`: `crate::bar`
2020
|
2121
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
22-
= note: for more information, see issue TBD
22+
= note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
2323

2424
error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition
2525
--> $DIR/edition-lint-paths.rs:33:9
@@ -28,7 +28,7 @@ LL | use {Bar as SomethingElse, main};
2828
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `crate`: `crate::{Bar as SomethingElse, main}`
2929
|
3030
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
31-
= note: for more information, see issue TBD
31+
= note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
3232

3333
error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition
3434
--> $DIR/edition-lint-paths.rs:45:5
@@ -37,7 +37,7 @@ LL | use bar::Bar;
3737
| ^^^^^^^^ help: use `crate`: `crate::bar::Bar`
3838
|
3939
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
40-
= note: for more information, see issue TBD
40+
= note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
4141

4242
error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition
4343
--> $DIR/edition-lint-paths.rs:57:9
@@ -46,7 +46,7 @@ LL | use *;
4646
| ^ help: use `crate`: `crate::*`
4747
|
4848
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
49-
= note: for more information, see issue TBD
49+
= note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
5050

5151
error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition
5252
--> $DIR/edition-lint-paths.rs:62:6
@@ -55,7 +55,7 @@ LL | impl ::foo::SomeTrait for u32 { }
5555
| ^^^^^^^^^^^^^^^^ help: use `crate`: `crate::foo::SomeTrait`
5656
|
5757
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
58-
= note: for more information, see issue TBD
58+
= note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
5959

6060
error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition
6161
--> $DIR/edition-lint-paths.rs:67:13
@@ -64,7 +64,7 @@ LL | let x = ::bar::Bar;
6464
| ^^^^^^^^^^ help: use `crate`: `crate::bar::Bar`
6565
|
6666
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
67-
= note: for more information, see issue TBD
67+
= note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
6868

6969
error: aborting due to 7 previous errors
7070

src/test/ui/rust-2018/extern-crate-rename.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ note: lint level defined here
1010
LL | #![deny(absolute_paths_not_starting_with_crate)]
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1212
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
13-
= note: for more information, see issue TBD
13+
= note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
1414

1515
error: aborting due to previous error
1616

src/test/ui/rust-2018/extern-crate-submod.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ note: lint level defined here
1010
LL | #![deny(absolute_paths_not_starting_with_crate)]
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1212
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
13-
= note: for more information, see issue TBD
13+
= note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
1414

1515
error: aborting due to previous error
1616

0 commit comments

Comments
 (0)