diff options
| author | bors <bors@rust-lang.org> | 2019-02-13 05:14:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-13 05:14:12 +0000 |
| commit | 827a141466e7bb85eb3c030600878a2c606019e9 (patch) | |
| tree | cbbbb0b46cf4a3694316b2462ae2dcf7321468e4 /src/test/codegen | |
| parent | 0f949c2fcc696d0260a99196d5e5400c59a26a54 (diff) | |
| parent | 6562c2860730aee4497f58b00c298d054ff2e0b7 (diff) | |
Auto merge of #58415 - Centril:rollup, r=Centril
Rollup of 12 pull requests Successful merges: - #57693 (Doc rewording) - #57815 (Speed up the fast path for assert_eq! and assert_ne!) - #58034 (Stabilize the time_checked_add feature) - #58057 (Stabilize linker-plugin based LTO (aka cross-language LTO)) - #58137 (Cleanup: rename node_id_to_type(_opt)) - #58166 (allow shorthand syntax for deprecation reason) - #58200 (fix str mutating through a ptr derived from &self) - #58273 (Rename rustc_errors dependency in rust 2018 crates) - #58289 (impl iter() for dyn Error) - #58387 (Disallow `auto` trait alias syntax) - #58404 (use Ubuntu keyserver for CloudABI ports) - #58405 (Remove some dead code from libcore) Failed merges: r? @ghost
Diffstat (limited to 'src/test/codegen')
| -rw-r--r-- | src/test/codegen/no-dllimport-w-cross-lang-lto.rs | 2 | ||||
| -rw-r--r-- | src/test/codegen/target-cpu-on-functions.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/codegen/no-dllimport-w-cross-lang-lto.rs b/src/test/codegen/no-dllimport-w-cross-lang-lto.rs index c1c1ef6ede2..33fc2bc1540 100644 --- a/src/test/codegen/no-dllimport-w-cross-lang-lto.rs +++ b/src/test/codegen/no-dllimport-w-cross-lang-lto.rs @@ -3,7 +3,7 @@ // no-prefer-dynamic // only-msvc -// compile-flags: -Z cross-lang-lto +// compile-flags: -C linker-plugin-lto #![crate_type = "rlib"] diff --git a/src/test/codegen/target-cpu-on-functions.rs b/src/test/codegen/target-cpu-on-functions.rs index 5692dca1df5..3fdf6ab6d00 100644 --- a/src/test/codegen/target-cpu-on-functions.rs +++ b/src/test/codegen/target-cpu-on-functions.rs @@ -3,7 +3,7 @@ // no-prefer-dynamic // ignore-tidy-linelength -// compile-flags: -C no-prepopulate-passes -C panic=abort -Z cross-lang-lto -Cpasses=name-anon-globals +// compile-flags: -C no-prepopulate-passes -C panic=abort -C linker-plugin-lto -Cpasses=name-anon-globals #![crate_type = "staticlib"] |