Skip to content

Commit 8dcea83

Browse files
Aaron1011Aaron1011
committed
Adjust lint to refer to allsorts-rental specifically
1 parent 7cde639 commit 8dcea83

File tree

4 files changed

+38
-127
lines changed

4 files changed

+38
-127
lines changed

‎compiler/rustc_expand/src/base.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1424,7 +1424,7 @@ fn pretty_printing_compatibility_hack(item: &Item, sess: &ParseSess) -> bool {
14241424
if variant.ident.name == sym::Input {
14251425
let filename = sess.source_map().span_to_filename(item.ident.span);
14261426
if let FileName::Real(real) = filename {
1427-
if let real
1427+
if real
14281428
.local_path()
14291429
.unwrap_or(Path::new(""))
14301430
.components()
@@ -1436,10 +1436,10 @@ fn pretty_printing_compatibility_hack(item: &Item, sess: &ParseSess) -> bool {
14361436
&PROC_MACRO_BACK_COMPAT,
14371437
item.ident.span,
14381438
ast::CRATE_NODE_ID,
1439-
"using an old version of `rental`",
1439+
"using `allsorts-rental`",
14401440
BuiltinLintDiagnostics::ProcMacroBackCompat(
1441-
"older versions of the `rental` crate will stop compiling in future versions of Rust; \
1442-
please update to `rental` v0.5.6, or switch to one of the `rental` alternatives".to_string()
1441+
"the `allsorts-rental` crate will stop compiling in future versions of Rust; \
1442+
please switch to `rental` v0.5.6, or switch to one of the `rental` alternatives like `ouroboros`".to_string()
14431443
)
14441444
);
14451445
return true;

‎tests/ui/proc-macro/pretty-print-hack-show.local.stderr

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,91 @@
1-
error: using an old version of `rental`
1+
error: using `allsorts-rental`
22
--> $DIR/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs:4:6
33
|
44
LL | enum ProceduralMasqueradeDummyType {
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
77
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
88
= note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
9-
= note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
9+
= note: the `allsorts-rental` crate will stop compiling in future versions of Rust; please switch to `rental` v0.5.6, or switch to one of the `rental` alternatives like `ouroboros`
1010
= note: `#[deny(proc_macro_back_compat)]` on by default
1111

12-
error: using an old version of `rental`
12+
error: using `allsorts-rental`
1313
--> $DIR/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs:4:6
1414
|
1515
LL | enum ProceduralMasqueradeDummyType {
1616
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1717
|
1818
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
1919
= note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
20-
= note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
20+
= note: the `allsorts-rental` crate will stop compiling in future versions of Rust; please switch to `rental` v0.5.6, or switch to one of the `rental` alternatives like `ouroboros`
2121

22-
error: using an old version of `rental`
22+
error: using `allsorts-rental`
2323
--> $DIR/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs:4:6
2424
|
2525
LL | enum ProceduralMasqueradeDummyType {
2626
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2727
|
2828
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
2929
= note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
30-
= note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
30+
= note: the `allsorts-rental` crate will stop compiling in future versions of Rust; please switch to `rental` v0.5.6, or switch to one of the `rental` alternatives like `ouroboros`
3131

32-
error: using an old version of `rental`
32+
error: using `allsorts-rental`
3333
--> $DIR/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs:4:6
3434
|
3535
LL | enum ProceduralMasqueradeDummyType {
3636
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3737
|
3838
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
3939
= note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
40-
= note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
40+
= note: the `allsorts-rental` crate will stop compiling in future versions of Rust; please switch to `rental` v0.5.6, or switch to one of the `rental` alternatives like `ouroboros`
4141

4242
error: aborting due to 4 previous errors
4343

4444
Future incompatibility report: Future breakage diagnostic:
45-
error: using an old version of `rental`
45+
error: using `allsorts-rental`
4646
--> $DIR/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs:4:6
4747
|
4848
LL | enum ProceduralMasqueradeDummyType {
4949
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5050
|
5151
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
5252
= note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
53-
= note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
53+
= note: the `allsorts-rental` crate will stop compiling in future versions of Rust; please switch to `rental` v0.5.6, or switch to one of the `rental` alternatives like `ouroboros`
5454
= note: `#[deny(proc_macro_back_compat)]` on by default
5555

5656
Future breakage diagnostic:
57-
error: using an old version of `rental`
57+
error: using `allsorts-rental`
5858
--> $DIR/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs:4:6
5959
|
6060
LL | enum ProceduralMasqueradeDummyType {
6161
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6262
|
6363
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
6464
= note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
65-
= note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
65+
= note: the `allsorts-rental` crate will stop compiling in future versions of Rust; please switch to `rental` v0.5.6, or switch to one of the `rental` alternatives like `ouroboros`
6666
= note: `#[deny(proc_macro_back_compat)]` on by default
6767

6868
Future breakage diagnostic:
69-
error: using an old version of `rental`
69+
error: using `allsorts-rental`
7070
--> $DIR/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs:4:6
7171
|
7272
LL | enum ProceduralMasqueradeDummyType {
7373
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7474
|
7575
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
7676
= note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
77-
= note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
77+
= note: the `allsorts-rental` crate will stop compiling in future versions of Rust; please switch to `rental` v0.5.6, or switch to one of the `rental` alternatives like `ouroboros`
7878
= note: `#[deny(proc_macro_back_compat)]` on by default
7979

8080
Future breakage diagnostic:
81-
error: using an old version of `rental`
81+
error: using `allsorts-rental`
8282
--> $DIR/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs:4:6
8383
|
8484
LL | enum ProceduralMasqueradeDummyType {
8585
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
8686
|
8787
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
8888
= note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
89-
= note: older versions of the `rental` crate will stop compiling in future versions of Rust; please update to `rental` v0.5.6, or switch to one of the `rental` alternatives
89+
= note: the `allsorts-rental` crate will stop compiling in future versions of Rust; please switch to `rental` v0.5.6, or switch to one of the `rental` alternatives like `ouroboros`
9090
= note: `#[deny(proc_macro_back_compat)]` on by default
9191

0 commit comments

Comments
 (0)