diff options
| author | bors <bors@rust-lang.org> | 2019-07-03 23:39:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-03 23:39:36 +0000 |
| commit | b43eb4235ac43c822d903ad26ed806f34cc1a14a (patch) | |
| tree | 124c3531ddc1815ad1586b3c78373f9e9117ce3c /src/test/incremental/thinlto | |
| parent | 088b987307b91612ab164026e1dcdd0129fdb62b (diff) | |
| parent | 6363a58e9af1b00669ebf1e343a67e3d1815f463 (diff) | |
| download | rust-b43eb4235ac43c822d903ad26ed806f34cc1a14a.tar.gz rust-b43eb4235ac43c822d903ad26ed806f34cc1a14a.zip | |
Auto merge of #62355 - Centril:rollup-xnxtcgm, r=Centril
Rollup of 16 pull requests
Successful merges:
- #62039 (Remove needless lifetimes (rustc))
- #62173 (rename InterpretCx -> InterpCx)
- #62240 (wfcheck: resolve the type-vars in `AdtField` types)
- #62249 (Use mem::take instead of mem::replace with default)
- #62252 (Update mem::replace example to not be identical to mem::take)
- #62258 (syntax: Unsupport `foo! bar { ... }` macros in the parser)
- #62268 (Clean up inherent_impls)
- #62287 (Use link attributes on extern "C" blocks with llvm-libuwind)
- #62295 (miri realloc: do not require giving old size+align)
- #62297 (refactor check_for_substitution)
- #62316 (When possible without changing semantics, implement Iterator::last in terms of DoubleEndedIterator::next_back for types in liballoc and libcore.)
- #62317 (Migrate `compile-pass` annotations to `build-pass`)
- #62337 (Fix bucket in CPU usage script)
- #62344 (simplify Option::get_or_insert)
- #62346 (enable a few more tests in Miri and update the comment for others)
- #62351 (remove bogus example from drop_in_place)
Failed merges:
r? @ghost
Diffstat (limited to 'src/test/incremental/thinlto')
| -rw-r--r-- | src/test/incremental/thinlto/cgu_invalidated_via_import.rs | 2 | ||||
| -rw-r--r-- | src/test/incremental/thinlto/independent_cgus_dont_affect_each_other.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/incremental/thinlto/cgu_invalidated_via_import.rs b/src/test/incremental/thinlto/cgu_invalidated_via_import.rs index 09c429f0ad8..8160f8f3a99 100644 --- a/src/test/incremental/thinlto/cgu_invalidated_via_import.rs +++ b/src/test/incremental/thinlto/cgu_invalidated_via_import.rs @@ -4,7 +4,7 @@ // revisions: cfail1 cfail2 cfail3 // compile-flags: -Z query-dep-graph -O -// compile-pass +// build-pass (FIXME(62277): could be check-pass?) #![feature(rustc_attrs)] #![crate_type="rlib"] diff --git a/src/test/incremental/thinlto/independent_cgus_dont_affect_each_other.rs b/src/test/incremental/thinlto/independent_cgus_dont_affect_each_other.rs index da6aa79b9d3..24e5d2438bd 100644 --- a/src/test/incremental/thinlto/independent_cgus_dont_affect_each_other.rs +++ b/src/test/incremental/thinlto/independent_cgus_dont_affect_each_other.rs @@ -3,7 +3,7 @@ // revisions: cfail1 cfail2 cfail3 // compile-flags: -Z query-dep-graph -O -// compile-pass +// build-pass (FIXME(62277): could be check-pass?) #![feature(rustc_attrs)] #![crate_type="rlib"] |