Skip to content

Commit 08c149b

Browse files
committed
rename our proc-macro test crate to a more clear name
and remove serde_derive, since the --extern .so file was really just a consequence of building a proc macro
1 parent a379a95 commit 08c149b

File tree

7 files changed

+20
-45
lines changed

7 files changed

+20
-45
lines changed

src/tools/miri/test-cargo-miri/Cargo.lock

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@ dependencies = [
3333
"issue_1567",
3434
"issue_1691",
3535
"issue_1705",
36-
"issue_1760",
3736
"issue_rust_86261",
3837
"proc-macro2",
39-
"serde_derive",
38+
"proc_macro_crate",
4039
]
4140

4241
[[package]]
@@ -91,10 +90,6 @@ dependencies = [
9190
"byteorder 1.4.3",
9291
]
9392

94-
[[package]]
95-
name = "issue_1760"
96-
version = "0.1.0"
97-
9893
[[package]]
9994
name = "issue_rust_86261"
10095
version = "0.1.0"
@@ -115,23 +110,10 @@ dependencies = [
115110
]
116111

117112
[[package]]
118-
name = "quote"
119-
version = "1.0.33"
120-
source = "registry+https://github.com/rust-lang/crates.io-index"
121-
checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
122-
dependencies = [
123-
"proc-macro2",
124-
]
125-
126-
[[package]]
127-
name = "serde_derive"
128-
version = "1.0.185"
129-
source = "registry+https://github.com/rust-lang/crates.io-index"
130-
checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec"
113+
name = "proc_macro_crate"
114+
version = "0.1.0"
131115
dependencies = [
132116
"proc-macro2",
133-
"quote",
134-
"syn",
135117
]
136118

137119
[[package]]
@@ -141,17 +123,6 @@ dependencies = [
141123
"byteorder 1.4.3",
142124
]
143125

144-
[[package]]
145-
name = "syn"
146-
version = "2.0.29"
147-
source = "registry+https://github.com/rust-lang/crates.io-index"
148-
checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
149-
dependencies = [
150-
"proc-macro2",
151-
"quote",
152-
"unicode-ident",
153-
]
154-
155126
[[package]]
156127
name = "unicode-ident"
157128
version = "1.0.6"

src/tools/miri/test-cargo-miri/Cargo.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,19 @@ edition = "2018"
1212
byteorder = "1.0"
1313
cdylib = { path = "cdylib" }
1414
exported_symbol = { path = "exported-symbol" }
15+
proc_macro_crate = { path = "proc-macro-crate" }
1516
issue_1567 = { path = "issue-1567" }
1617
issue_1691 = { path = "issue-1691" }
1718
issue_1705 = { path = "issue-1705" }
18-
issue_1760 = { path = "issue-1760" }
1919
issue_rust_86261 = { path = "issue-rust-86261" }
2020

2121
[dev-dependencies]
2222
byteorder_2 = { package = "byteorder", version = "0.5" } # to test dev-dependencies behave as expected, with renaming
2323
## More dependencies that we don't actually use, but add just for extra test coverage.
24-
# Exercises some unique code path (`--extern` .so file).
25-
serde_derive = "1.0.185"
2624
# These use custom build probes, let's make sure they don't explode.
2725
# (Ideally we'd check if the probe was successful, but that's not easily possible.)
28-
# proc-macro2 is extra exciting because it is both a host-dependency and a target-dependency.
26+
# proc-macro2 is extra exciting because it is both a host-dependency (of proc_macro_crate above)
27+
# and a target-dependency.
2928
proc-macro2 = "1.0"
3029
eyre = "0.6"
3130

src/tools/miri/test-cargo-miri/issue-1760/Cargo.toml

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[package]
2+
# regression test for issue 1760
3+
name = "proc_macro_crate"
4+
version = "0.1.0"
5+
authors = ["Miri Team"]
6+
edition = "2018"
7+
8+
[lib]
9+
proc-macro = true
10+
11+
[dependencies]
12+
# A common dependency of proc macros, let's make sure that works.
13+
proc-macro2 = "1.0"

src/tools/miri/test-cargo-miri/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
/// ```
2929
#[no_mangle]
3030
pub fn make_true() -> bool {
31+
proc_macro_crate::use_the_dependency!();
3132
issue_1567::use_the_dependency();
3233
issue_1705::use_the_dependency();
33-
issue_1760::use_the_dependency!();
3434
issue_1691::use_me()
3535
}
3636

0 commit comments

Comments
 (0)