Skip to content

Commit b8f6c20

Browse files
authored
Auto merge of #37895 - jseyfried:fix_proc_macro_deps, r=nrc
Fix bug involving proc-macro dependencies Fixes #37893. r? @nrc
2 parents fc2373c + 7d0c76a commit b8f6c20

File tree

5 files changed

+45
-0
lines changed

5 files changed

+45
-0
lines changed

src/librustc_metadata/creader.rs

+3
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,9 @@ impl<'a> CrateLoader<'a> {
366366
match result {
367367
LoadResult::Previous(cnum) => {
368368
let data = self.cstore.get_crate_data(cnum);
369+
if data.root.macro_derive_registrar.is_some() {
370+
dep_kind = DepKind::MacrosOnly;
371+
}
369372
data.dep_kind.set(cmp::max(data.dep_kind.get(), dep_kind));
370373
(cnum, data)
371374
}
+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-include ../tools.mk
2+
3+
all:
4+
$(RUSTC) a.rs && $(RUSTC) b.rs && $(RUSTC) c.rs

src/test/run-make/issue-37893/a.rs

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![feature(proc_macro)]
12+
#![allow(unused)]
13+
#![crate_type = "proc-macro"]

src/test/run-make/issue-37893/b.rs

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![crate_type = "lib"]
12+
#[macro_use] extern crate a;

src/test/run-make/issue-37893/c.rs

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![crate_type = "staticlib"]
12+
extern crate b;
13+
extern crate a;

0 commit comments

Comments
 (0)