Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow --test to be used on proc-macro crates #38107

Merged
merged 1 commit into from
Dec 5, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/libsyntax_ext/proc_macro_registrar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ pub fn modify(sess: &ParseSess,
handler.err("cannot mix `proc-macro` crate type with others");
}

if is_test_crate {
return krate;
}

krate.module.items.push(mk_registrar(&mut cx, &collect.derives));

if krate.exported_macros.len() > 0 {
Expand Down Expand Up @@ -141,8 +145,6 @@ impl<'a> Visitor for CollectCustomDerives<'a> {
}

if self.is_test_crate {
self.handler.span_err(attr.span(),
"`--test` cannot be used with proc-macro crates");
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,23 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// no-prefer-dynamic
// compile-flags: --test

#![crate_type = "proc-macro"]
#![feature(proc_macro)]
#![feature(proc_macro, proc_macro_lib)]

extern crate proc_macro;

#[proc_macro_derive(A)]
//~^ ERROR: `--test` cannot be used with proc-macro crates
pub fn foo1(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
use proc_macro::TokenStream;

#[proc_macro_derive(Foo)]
pub fn derive_foo(_input: TokenStream) -> TokenStream {
"".parse().unwrap()
}

#[test]
pub fn test_derive() {
assert!(true);
}