development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-10-02 22:13:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Treat "proc-macro" crate type the same as proc-macro = true

Browse source
This commit is contained in:
Eric Huss 2018-11-03 12:36:41 -07:00
parent 0eee76ec9a
commit e295a900bb
2 changed files with 74 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/cargo/util/toml/mod.rs
View file

@ -1474,7 +1474,14 @@ impl TomlTarget {
}
fn proc_macro(&self) -> Option<bool> {
self.proc_macro.or(self.proc_macro2)
self.proc_macro.or(self.proc_macro2).or_else(|| {
if let Some(types) = self.crate_types() {
if types.contains(&"proc-macro".to_string()) {
return Some(true);
}
}
None
})
}
fn crate_types(&self) -> Option<&Vec<String>> {

66
tests/testsuite/proc_macro.rs
View file

@ -279,3 +279,69 @@ fn a() {
.with_stdout_contains_n("test [..] ... ok", 2)
.run();
}
#[test]
fn proc_macro_crate_type() {
// Verify that `crate-type = ["proc-macro"]` is the same as `proc-macro = true`
// and that everything, including rustdoc, works correctly.
let foo = project()
.file(
"Cargo.toml",
r#"
[package]
name = "foo"
version = "0.1.0"
[dependencies]
pm = { path = "pm" }
"#,
)
.file(
"src/lib.rs",
r#"
//! ```
//! use foo::THING;
//! assert_eq!(THING, 123);
//! ```
#[macro_use]
extern crate pm;
#[derive(MkItem)]
pub struct S;
#[cfg(test)]
mod tests {
use super::THING;
#[test]
fn it_works() {
assert_eq!(THING, 123);
}
}
"#,
)
.file(
"pm/Cargo.toml",
r#"
[package]
name = "pm"
version = "0.1.0"
[lib]
crate-type = ["proc-macro"]
"#,
)
.file(
"pm/src/lib.rs",
r#"
extern crate proc_macro;
use proc_macro::TokenStream;
#[proc_macro_derive(MkItem)]
pub fn mk_item(_input: TokenStream) -> TokenStream {
"pub const THING: i32 = 123;".parse().unwrap()
}
"#,
)
.build();
foo.cargo("test")
.with_stdout_contains("test tests::it_works ... ok")
.with_stdout_contains_n("test [..] ... ok", 2)
.run();
}