development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-09-13 21:11:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #8765 - l4l:proc-macro-suffix, r=alexcrichton

Browse source 
Mark proc-macro crates

Resolves #8107
This commit is contained in:
bors 2020-10-11 17:20:05 +00:00
parent b8448d7c41 d17311df6c
commit ab69d6a99e
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/cargo/ops/tree/format/mod.rs
View file

@ -66,7 +66,18 @@ impl<'a> fmt::Display for Display<'a> {
match chunk {
Chunk::Raw(s) => fmt.write_str(s)?,
Chunk::Package => {
write!(fmt, "{} v{}", package.name(), package.version())?;
let proc_macro_suffix = if package.proc_macro() {
" (proc-macro)"
} else {
""
};
write!(
fmt,
"{} v{}{}",
package.name(),
package.version(),
proc_macro_suffix
)?;
let source_id = package.package_id().source_id();
if !source_id.is_default_registry() {

18
tests/testsuite/tree.rs
View file

@ -379,7 +379,7 @@ fn filters_target() {
"\
foo v0.1.0 ([..]/foo)
├── hostdep v1.0.0
└── pm_host v1.0.0
└── pm_host v1.0.0 (proc-macro)
[build-dependencies]
└── build_host_dep v1.0.0
└── hostdep v1.0.0
@ -392,7 +392,7 @@ foo v0.1.0 ([..]/foo)
.with_stdout(
"\
foo v0.1.0 ([..]/foo)
├── pm_target v1.0.0
├── pm_target v1.0.0 (proc-macro)
└── targetdep v1.0.0
[build-dependencies]
└── build_host_dep v1.0.0
@ -409,7 +409,7 @@ foo v0.1.0 ([..]/foo)
"\
foo v0.1.0 ([..]/foo)
├── hostdep v1.0.0
└── pm_host v1.0.0
└── pm_host v1.0.0 (proc-macro)
[build-dependencies]
└── build_host_dep v1.0.0
└── hostdep v1.0.0
@ -422,8 +422,8 @@ foo v0.1.0 ([..]/foo)
"\
foo v0.1.0 ([..]/foo)
├── hostdep v1.0.0
├── pm_host v1.0.0
├── pm_target v1.0.0
├── pm_host v1.0.0 (proc-macro)
├── pm_target v1.0.0 (proc-macro)
└── targetdep v1.0.0
[build-dependencies]
├── build_host_dep v1.0.0
@ -1211,7 +1211,7 @@ fn proc_macro_features() {
.with_stdout(
"\
foo v0.1.0 ([..]/foo)
├── pm v1.0.0
├── pm v1.0.0 (proc-macro)
│ └── somedep v1.0.0
│ └── optdep v1.0.0
└── somedep v1.0.0 (*)
@ -1225,7 +1225,7 @@ foo v0.1.0 ([..]/foo)
.with_stdout(
"\
foo v0.1.0 ([..]/foo)
├── pm v1.0.0
├── pm v1.0.0 (proc-macro)
│ └── somedep v1.0.0
│ └── optdep v1.0.0
└── somedep v1.0.0
@ -1261,7 +1261,7 @@ somedep v1.0.0
"\
somedep v1.0.0
├── foo v0.1.0 ([..]/foo)
└── pm v1.0.0
└── pm v1.0.0 (proc-macro)
└── foo v0.1.0 ([..]/foo)
",
)
@ -1275,7 +1275,7 @@ somedep v1.0.0
└── foo v0.1.0 ([..]/foo)
somedep v1.0.0
└── pm v1.0.0
└── pm v1.0.0 (proc-macro)
└── foo v0.1.0 ([..]/foo)
",
)