Skip to content

Commit ab69d6a

Browse files
committed
Auto merge of #8765 - l4l:proc-macro-suffix, r=alexcrichton
Mark proc-macro crates Resolves #8107
2 parents b8448d7 + d17311d commit ab69d6a

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

src/cargo/ops/tree/format/mod.rs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,18 @@ impl<'a> fmt::Display for Display<'a> {
6666
match chunk {
6767
Chunk::Raw(s) => fmt.write_str(s)?,
6868
Chunk::Package => {
69-
write!(fmt, "{} v{}", package.name(), package.version())?;
69+
let proc_macro_suffix = if package.proc_macro() {
70+
" (proc-macro)"
71+
} else {
72+
""
73+
};
74+
write!(
75+
fmt,
76+
"{} v{}{}",
77+
package.name(),
78+
package.version(),
79+
proc_macro_suffix
80+
)?;
7081

7182
let source_id = package.package_id().source_id();
7283
if !source_id.is_default_registry() {

tests/testsuite/tree.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ fn filters_target() {
379379
"\
380380
foo v0.1.0 ([..]/foo)
381381
├── hostdep v1.0.0
382-
└── pm_host v1.0.0
382+
└── pm_host v1.0.0 (proc-macro)
383383
[build-dependencies]
384384
└── build_host_dep v1.0.0
385385
└── hostdep v1.0.0
@@ -392,7 +392,7 @@ foo v0.1.0 ([..]/foo)
392392
.with_stdout(
393393
"\
394394
foo v0.1.0 ([..]/foo)
395-
├── pm_target v1.0.0
395+
├── pm_target v1.0.0 (proc-macro)
396396
└── targetdep v1.0.0
397397
[build-dependencies]
398398
└── build_host_dep v1.0.0
@@ -409,7 +409,7 @@ foo v0.1.0 ([..]/foo)
409409
"\
410410
foo v0.1.0 ([..]/foo)
411411
├── hostdep v1.0.0
412-
└── pm_host v1.0.0
412+
└── pm_host v1.0.0 (proc-macro)
413413
[build-dependencies]
414414
└── build_host_dep v1.0.0
415415
└── hostdep v1.0.0
@@ -422,8 +422,8 @@ foo v0.1.0 ([..]/foo)
422422
"\
423423
foo v0.1.0 ([..]/foo)
424424
├── hostdep v1.0.0
425-
├── pm_host v1.0.0
426-
├── pm_target v1.0.0
425+
├── pm_host v1.0.0 (proc-macro)
426+
├── pm_target v1.0.0 (proc-macro)
427427
└── targetdep v1.0.0
428428
[build-dependencies]
429429
├── build_host_dep v1.0.0
@@ -1211,7 +1211,7 @@ fn proc_macro_features() {
12111211
.with_stdout(
12121212
"\
12131213
foo v0.1.0 ([..]/foo)
1214-
├── pm v1.0.0
1214+
├── pm v1.0.0 (proc-macro)
12151215
│ └── somedep v1.0.0
12161216
│ └── optdep v1.0.0
12171217
└── somedep v1.0.0 (*)
@@ -1225,7 +1225,7 @@ foo v0.1.0 ([..]/foo)
12251225
.with_stdout(
12261226
"\
12271227
foo v0.1.0 ([..]/foo)
1228-
├── pm v1.0.0
1228+
├── pm v1.0.0 (proc-macro)
12291229
│ └── somedep v1.0.0
12301230
│ └── optdep v1.0.0
12311231
└── somedep v1.0.0
@@ -1261,7 +1261,7 @@ somedep v1.0.0
12611261
"\
12621262
somedep v1.0.0
12631263
├── foo v0.1.0 ([..]/foo)
1264-
└── pm v1.0.0
1264+
└── pm v1.0.0 (proc-macro)
12651265
└── foo v0.1.0 ([..]/foo)
12661266
",
12671267
)
@@ -1275,7 +1275,7 @@ somedep v1.0.0
12751275
└── foo v0.1.0 ([..]/foo)
12761276
12771277
somedep v1.0.0
1278-
└── pm v1.0.0
1278+
└── pm v1.0.0 (proc-macro)
12791279
└── foo v0.1.0 ([..]/foo)
12801280
",
12811281
)

0 commit comments

Comments
 (0)