Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 9a6ea38

Browse files
Aaron1011Aaron1011
committed
Add hack to keep actix-web and actori-web compiling
This extends the existing `ident_name_compatibility_hack` to handle the `tuple_from_req` macro defined in `actix-web` (and its fork `actori-web`).
1 parent 477ce31 commit 9a6ea38

File tree

8 files changed

+77
-5
lines changed

8 files changed

+77
-5
lines changed

‎compiler/rustc_ast/src/token.rs

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -810,25 +810,36 @@ impl Nonterminal {
810810
if let ExpnKind::Macro(_, macro_name) = orig_span.ctxt().outer_expn_data().kind {
811811
let filename = source_map.span_to_filename(orig_span);
812812
if let FileName::Real(RealFileName::Named(path)) = filename {
813-
let matches_prefix = |prefix| {
814-
// Check for a path that ends with 'prefix*/src/lib.rs'
813+
let matches_prefix = |prefix, filename| {
814+
// Check for a path that ends with 'prefix*/src/<filename>'
815815
let mut iter = path.components().rev();
816-
iter.next().and_then(|p| p.as_os_str().to_str()) == Some("lib.rs")
816+
iter.next().and_then(|p| p.as_os_str().to_str()) == Some(filename)
817817
&& iter.next().and_then(|p| p.as_os_str().to_str()) == Some("src")
818818
&& iter
819819
.next()
820820
.and_then(|p| p.as_os_str().to_str())
821821
.map_or(false, |p| p.starts_with(prefix))
822822
};
823823

824-
if (macro_name == sym::impl_macros && matches_prefix("time-macros-impl"))
825-
|| (macro_name == sym::arrays && matches_prefix("js-sys"))
824+
if (macro_name == sym::impl_macros
825+
&& matches_prefix("time-macros-impl", "lib.rs"))
826+
|| (macro_name == sym::arrays && matches_prefix("js-sys", "lib.rs"))
826827
{
827828
let snippet = source_map.span_to_snippet(orig_span);
828829
if snippet.as_deref() == Ok("$name") {
829830
return Some((*ident, *is_raw));
830831
}
831832
}
833+
834+
if macro_name == sym::tuple_from_req
835+
&& (matches_prefix("actix-web", "extract.rs")
836+
|| matches_prefix("actori-web", "extract.rs"))
837+
{
838+
let snippet = source_map.span_to_snippet(orig_span);
839+
if snippet.as_deref() == Ok("$T") {
840+
return Some((*ident, *is_raw));
841+
}
842+
}
832843
}
833844
}
834845
}

‎compiler/rustc_span/src/symbol.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,6 +1114,7 @@ symbols! {
11141114
try_trait,
11151115
tt,
11161116
tuple,
1117+
tuple_from_req,
11171118
tuple_indexing,
11181119
two_phase,
11191120
ty,

‎src/test/ui/proc-macro/group-compat-hack/actix-web-2.0.0/src/extract.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// ignore-test this is not a test
2+
3+
macro_rules! tuple_from_req {
4+
($T:ident) => {
5+
#[my_macro] struct Three($T);
6+
}
7+
}

‎src/test/ui/proc-macro/group-compat-hack/actix-web/src/extract.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// ignore-test this is not a test
2+
3+
macro_rules! tuple_from_req {
4+
($T:ident) => {
5+
#[my_macro] struct Three($T);
6+
}
7+
}

‎src/test/ui/proc-macro/group-compat-hack/actori-web-2.0.0/src/extract.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// ignore-test this is not a test
2+
3+
macro_rules! tuple_from_req {
4+
($T:ident) => {
5+
#[my_macro] struct Four($T);
6+
}
7+
}

‎src/test/ui/proc-macro/group-compat-hack/actori-web/src/extract.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// ignore-test this is not a test
2+
3+
macro_rules! tuple_from_req {
4+
($T:ident) => {
5+
#[my_macro] struct Four($T);
6+
}
7+
}

‎src/test/ui/proc-macro/group-compat-hack/group-compat-hack.rs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,33 @@ mod with_version {
4545
other!(Foo);
4646
}
4747

48+
mod actix_web_test {
49+
include!("actix-web/src/extract.rs");
50+
51+
struct Foo;
52+
tuple_from_req!(Foo);
53+
}
54+
55+
mod actix_web_version_test {
56+
include!("actix-web-2.0.0/src/extract.rs");
57+
58+
struct Foo;
59+
tuple_from_req!(Foo);
60+
}
61+
62+
mod actori_web_test {
63+
include!("actori-web/src/extract.rs");
64+
65+
struct Foo;
66+
tuple_from_req!(Foo);
67+
}
68+
69+
mod actori_web_version_test {
70+
include!("actori-web-2.0.0/src/extract.rs");
71+
72+
struct Foo;
73+
tuple_from_req!(Foo);
74+
}
75+
4876

4977
fn main() {}

‎src/test/ui/proc-macro/group-compat-hack/group-compat-hack.stdout

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ Called proc_macro_hack with TokenStream [Ident { ident: "struct", span: $DIR/gro
44
Called proc_macro_hack with TokenStream [Ident { ident: "struct", span: $DIR/time-macros-impl-0.1.0/src/lib.rs:5:21: 5:27 (#20) }, Ident { ident: "One", span: $DIR/time-macros-impl-0.1.0/src/lib.rs:5:28: 5:31 (#20) }, Group { delimiter: Parenthesis, stream: TokenStream [Ident { ident: "Foo", span: $DIR/group-compat-hack.rs:43:18: 43:21 (#0) }], span: $DIR/time-macros-impl-0.1.0/src/lib.rs:5:31: 5:38 (#20) }, Punct { ch: ';', spacing: Alone, span: $DIR/time-macros-impl-0.1.0/src/lib.rs:5:38: 5:39 (#20) }]
55
Called proc_macro_hack with TokenStream [Ident { ident: "struct", span: $DIR/js-sys-0.3.17/src/lib.rs:5:21: 5:27 (#24) }, Ident { ident: "Two", span: $DIR/js-sys-0.3.17/src/lib.rs:5:28: 5:31 (#24) }, Group { delimiter: Parenthesis, stream: TokenStream [Ident { ident: "Foo", span: $DIR/group-compat-hack.rs:44:13: 44:16 (#0) }], span: $DIR/js-sys-0.3.17/src/lib.rs:5:31: 5:38 (#24) }, Punct { ch: ';', spacing: Alone, span: $DIR/js-sys-0.3.17/src/lib.rs:5:38: 5:39 (#24) }]
66
Called proc_macro_hack with TokenStream [Ident { ident: "struct", span: $DIR/group-compat-hack.rs:38:25: 38:31 (#28) }, Ident { ident: "Three", span: $DIR/group-compat-hack.rs:38:32: 38:37 (#28) }, Group { delimiter: Parenthesis, stream: TokenStream [Group { delimiter: None, stream: TokenStream [Ident { ident: "Foo", span: $DIR/group-compat-hack.rs:45:12: 45:15 (#0) }], span: $DIR/group-compat-hack.rs:38:38: 38:43 (#28) }], span: $DIR/group-compat-hack.rs:38:37: 38:44 (#28) }, Punct { ch: ';', spacing: Alone, span: $DIR/group-compat-hack.rs:38:44: 38:45 (#28) }]
7+
Called proc_macro_hack with TokenStream [Ident { ident: "struct", span: $DIR/actix-web/src/extract.rs:5:21: 5:27 (#33) }, Ident { ident: "Three", span: $DIR/actix-web/src/extract.rs:5:28: 5:33 (#33) }, Group { delimiter: Parenthesis, stream: TokenStream [Ident { ident: "Foo", span: $DIR/group-compat-hack.rs:52:21: 52:24 (#0) }], span: $DIR/actix-web/src/extract.rs:5:33: 5:37 (#33) }, Punct { ch: ';', spacing: Alone, span: $DIR/actix-web/src/extract.rs:5:37: 5:38 (#33) }]
8+
Called proc_macro_hack with TokenStream [Ident { ident: "struct", span: $DIR/actix-web-2.0.0/src/extract.rs:5:21: 5:27 (#38) }, Ident { ident: "Three", span: $DIR/actix-web-2.0.0/src/extract.rs:5:28: 5:33 (#38) }, Group { delimiter: Parenthesis, stream: TokenStream [Ident { ident: "Foo", span: $DIR/group-compat-hack.rs:59:21: 59:24 (#0) }], span: $DIR/actix-web-2.0.0/src/extract.rs:5:33: 5:37 (#38) }, Punct { ch: ';', spacing: Alone, span: $DIR/actix-web-2.0.0/src/extract.rs:5:37: 5:38 (#38) }]
9+
Called proc_macro_hack with TokenStream [Ident { ident: "struct", span: $DIR/actori-web/src/extract.rs:5:21: 5:27 (#43) }, Ident { ident: "Four", span: $DIR/actori-web/src/extract.rs:5:28: 5:32 (#43) }, Group { delimiter: Parenthesis, stream: TokenStream [Ident { ident: "Foo", span: $DIR/group-compat-hack.rs:66:21: 66:24 (#0) }], span: $DIR/actori-web/src/extract.rs:5:32: 5:36 (#43) }, Punct { ch: ';', spacing: Alone, span: $DIR/actori-web/src/extract.rs:5:36: 5:37 (#43) }]
10+
Called proc_macro_hack with TokenStream [Ident { ident: "struct", span: $DIR/actori-web-2.0.0/src/extract.rs:5:21: 5:27 (#48) }, Ident { ident: "Four", span: $DIR/actori-web-2.0.0/src/extract.rs:5:28: 5:32 (#48) }, Group { delimiter: Parenthesis, stream: TokenStream [Ident { ident: "Foo", span: $DIR/group-compat-hack.rs:73:21: 73:24 (#0) }], span: $DIR/actori-web-2.0.0/src/extract.rs:5:32: 5:36 (#48) }, Punct { ch: ';', spacing: Alone, span: $DIR/actori-web-2.0.0/src/extract.rs:5:36: 5:37 (#48) }]

0 commit comments

Comments
 (0)