Auto merge of #45915 - michaelwoerister:removed-nodes-in-try-mark-green, r=alexcrichton
incr.comp.: Don't crash in DepGraph::try_mark_green() when encountering a removed input node. Fixes a small regression that was introduced in #45867. r? @nikomatsakis
This commit is contained in:
commit
b5a3ab2e81
4 changed files with 60 additions and 5 deletions
13
src/test/incremental/remove_crate/auxiliary/extern_crate.rs
Normal file
13
src/test/incremental/remove_crate/auxiliary/extern_crate.rs
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
pub fn foo(_: u8) {
|
||||
|
||||
}
|
||||
34
src/test/incremental/remove_crate/main.rs
Normal file
34
src/test/incremental/remove_crate/main.rs
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// Test that removing an upstream crate does not cause any trouble.
|
||||
|
||||
// revisions:rpass1 rpass2
|
||||
// aux-build:extern_crate.rs
|
||||
|
||||
#[cfg(rpass1)]
|
||||
extern crate extern_crate;
|
||||
|
||||
pub fn main() {
|
||||
#[cfg(rpass1)]
|
||||
{
|
||||
extern_crate::foo(1);
|
||||
}
|
||||
|
||||
#[cfg(rpass2)]
|
||||
{
|
||||
foo(1);
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(rpass2)]
|
||||
pub fn foo(_: u8) {
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue