Skip to content

Commit b058dc0

Browse files
committed
Auto merge of #46811 - michaelwoerister:depkind-is-input, r=nikomatsakis
incr.comp.: Mark DepKind node as input. Fixes `euclid` on https://travis-ci.org/rust-icci. r? @nikomatsakis
2 parents a3a7203 + a3c3245 commit b058dc0

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

src/librustc/dep_graph/dep_node.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ define_dep_nodes!( <'tcx>
594594
[] ObjectLifetimeDefaults(DefIndex),
595595

596596
[] Visibility(DefId),
597-
[] DepKind(CrateNum),
597+
[input] DepKind(CrateNum),
598598
[input] CrateName(CrateNum),
599599
[] ItemChildren(DefId),
600600
[] ExternModStmtCnum(DefId),
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Copyright 2017 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+
// Test that we detect changes to the `dep_kind` query. If the change is not
12+
// detected then -Zincremental-verify-ich will trigger an assertion.
13+
14+
// revisions:cfail1 cfail2
15+
// compile-flags: -Z query-dep-graph -Cpanic=unwind
16+
// must-compile-successfully
17+
18+
#![feature(panic_unwind)]
19+
20+
// Turn the panic_unwind crate from an explicit into an implicit query:
21+
#[cfg(cfail1)]
22+
extern crate panic_unwind;
23+
24+
fn main() {}

0 commit comments

Comments
 (0)