Backporting accepted PRs to beta by alexcrichton · Pull Request #43831 · rust-lang/rust

alexcrichton · 2017-08-12T22:49:37Z

Backport of:

@alexcrichton

@alexcrichton figured out a way how to do it :)

This fixes an optimization regression by allowing LLVM to see through more functions. Closesrust-lang#43272

Stabilizes: * `<char>::escape_debug` * `std::char::EscapeDebug` Closesrust-lang#35068

Stabilized: * `Option::get_or_insert` * `Option::get_or_insert_with` Closesrust-lang#39288

Stabilized * `<str>::get` * `<str>::get_mut` * `<str>::get_unchecked` * `<str>::get_unchecked_mut` Closesrust-lang#39932

Stabilizes: * `CString::as_c_str` * `CString::into_boxed_c_str` * `CStr::into_c_string` * `OsString::into_boxed_os_str` * `OsStr::into_os_string` * `PathBuf::into_boxed_path` * `PathBuf::into_path_buf` Closesrust-lang#40380

Stabilizes: * `Utf8Error::error_len` Closesrust-lang#40494

Stabilizes * `core::mem::ManuallyDrop` * `std::mem::ManuallyDrop` * `ManuallyDrop::new` * `ManuallyDrop::into_inner` * `ManuallyDrop::drop` * `Deref for ManuallyDrop` * `DerefMut for ManuallyDrop` Closesrust-lang#40673

Stabilizes: * `compile_error!` as a macro defined by rustc Closesrust-lang#40872

Stabilizes * `<&mut str>::as_bytes_mut` * `<Box<str>>::into_boxed_bytes` * `std::str::from_boxed_utf8_unchecked` * `std::str::from_utf8_mut` * `std::str::from_utf8_unchecked_mut` Closesrust-lang#41119

alexcrichton · 2017-08-12T22:49:42Z

@bors: r+

bors · 2017-08-12T22:49:43Z

📌 Commit 808f8ea has been approved by alexcrichton

alexcrichton · 2017-08-13T02:29:14Z

@bors: r+

This also now bumps beta to .2

bors · 2017-08-13T02:29:15Z

📌 Commit edaa924 has been approved by alexcrichton

ishitatsuyuki · 2017-08-13T08:59:23Z

Lockfile out of date.

alexcrichton · 2017-08-13T12:06:34Z

@bors: r+ p=1

(beta backport)

bors · 2017-08-13T12:06:34Z

📌 Commit 5f554ed has been approved by alexcrichton

bors · 2017-08-13T15:28:31Z

⌛ Testing commit 5f554ed with merge 1cbf41d59eb107c7d2063ca88fd5fae8bf29a813...

bors · 2017-08-13T16:46:09Z

💔 Test failed - status-travis

kennytm · 2017-08-13T17:04:05Z

@bors retry should be #38618

Details

[01:13:16] Running build/x86_64-unknown-linux-gnu/stage2-test/i686-unknown-linux-musl/release/deps/test-e83a411296b8a083
[01:13:16] [01:13:16] running 36 tests
[01:13:16] test stats::bench::no_iter ... ok
[01:13:16] test should_sort_failures_before_printing_them ... ok
[01:13:16] test stats::bench::sum_three_items ... ok
[01:13:16] test stats::tests::test_binom25 ... ok
[01:13:16] test stats::bench::sum_many_f64 ... ok
[01:13:16] test stats::tests::test_exp10a ... ok
[01:13:16] test stats::tests::test_exp10b ... ok
[01:13:16] test stats::tests::test_exp10c ... ok
[01:13:16] test stats::tests::test_exp25 ... ok
[01:13:16] test stats::tests::test_min_max_nan ... ok
[01:13:16] test stats::tests::test_norm10medium ... ok
[01:13:16] test stats::tests::test_norm10narrow ... ok
[01:13:16] test stats::tests::test_norm10wide ... ok
[01:13:16] test stats::tests::test_norm2 ... ok
[01:13:16] test stats::tests::test_norm25verynarrow ... ok
[01:13:16] test stats::tests::test_pois25lambda30 ... ok
[01:13:16] test stats::tests::test_pois25lambda40 ... ok
[01:13:16] test stats::tests::test_sum_f64s ... ok
[01:13:16] test stats::tests::test_sum_f64_between_ints_that_sum_to_0 ... ok
[01:13:16] test stats::tests::test_pois25lambda50 ... ok
[01:13:16] test stats::tests::test_unif25 ... ok
[01:13:16] test tests::do_not_run_ignored_tests ... ok
[01:13:16] test tests::exact_filter_match ... ok
[01:13:16] test tests::filter_for_ignored_option ... ok
[01:13:16] test tests::ignored_tests_result_in_ignored ... ok
[01:13:16] test tests::parse_ignored_flag ... ok
[01:13:16] test tests::test_bench_no_iter ... ok
[01:13:16] test tests::sort_tests ... ok
[01:13:16] test tests::test_bench_once_no_iter ... ok
[01:13:16] test tests::test_metricmap_compare ... ok
[01:13:16] test tests::test_should_panic ... ok
[01:13:16] error: An unknown error occurred
[01:13:16] [01:13:16] To learn more, run the command again with --verbose.
[01:13:16] [01:13:16] [01:13:16] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "-j" "4" "--target" "i686-unknown-linux-musl" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/libtest/Cargo.toml" "--features" "" "-p" "test:0.0.0" "-p" "term:0.0.0" "--"
[01:13:16] expected success, got: exit code: 101
[01:13:16] [01:13:16] [01:13:16] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --target i686-unknown-linux-musl --target i586-unknown-linux-gnu
[01:13:16] Build completed unsuccessfully in 1:11:59
[01:13:16]

bors · 2017-08-13T17:04:20Z

⌛ Testing commit 5f554ed with merge 54279df...

Backporting accepted PRs to beta Backport of: * #43735 * #43546 * #43513 * #43373 * #43315

bors · 2017-08-13T19:28:52Z

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 54279df to beta...

est31and others added 13 commits August 12, 2017 15:43

Avoid calling the column!() macro in panic
e56fa24

Add a feature gate
c51b709
@alexcrichton figured out a way how to do it :)

save the subobligations as well
309ab47

std: Mark Layout::repeat as #[inline]
086f9e4
This fixes an optimization regression by allowing LLVM to see through more functions. Closesrust-lang#43272

std: Stabilize char_escape_debug
1206c80
Stabilizes: * `<char>::escape_debug` * `std::char::EscapeDebug` Closesrust-lang#35068

std: Stabilize option_entry feature
d85df50
Stabilized: * `Option::get_or_insert` * `Option::get_or_insert_with` Closesrust-lang#39288

std: Stabilize str_checked_slicing feature
b20d248
Stabilized * `<str>::get` * `<str>::get_mut` * `<str>::get_unchecked` * `<str>::get_unchecked_mut` Closesrust-lang#39932

std: Stabilize CString/OsString/PathBuf extra methods
9ec2b5b
Stabilizes: * `CString::as_c_str` * `CString::into_boxed_c_str` * `CStr::into_c_string` * `OsString::into_boxed_os_str` * `OsStr::into_os_string` * `PathBuf::into_boxed_path` * `PathBuf::into_path_buf` Closesrust-lang#40380

std: Stabilize utf8_error_error_len feature
59ccb2f
Stabilizes: * `Utf8Error::error_len` Closesrust-lang#40494

std: Stabilize manually_drop feature
7e22e24
Stabilizes * `core::mem::ManuallyDrop` * `std::mem::ManuallyDrop` * `ManuallyDrop::new` * `ManuallyDrop::into_inner` * `ManuallyDrop::drop` * `Deref for ManuallyDrop` * `DerefMut for ManuallyDrop` Closesrust-lang#40673

Stabilize the compile_error_macro feature
febb255
Stabilizes: * `compile_error!` as a macro defined by rustc Closesrust-lang#40872

std: Stabilize the str_{mut,box}_extras feature
a2b8556
Stabilizes * `<&mut str>::as_bytes_mut` * `<Box<str>>::into_boxed_bytes` * `std::str::from_boxed_utf8_unchecked` * `std::str::from_utf8_mut` * `std::str::from_utf8_unchecked_mut` Closesrust-lang#41119

float_bits_conv made it into 1.20
808f8ea

alexcrichton added 2 commits August 13, 2017 05:05

Update cargo submodule
44a6d0b

Bump beta to .2
5f554ed

alexcrichton force-pushed the beta-next branch from edaa924 to 5f554edCompare August 13, 2017 12:06

bors added a commit that referenced this pull request Aug 13, 2017
Auto merge of#43831- alexcrichton:beta-next, r=alexcrichton
54279df
Backporting accepted PRs to beta Backport of: * #43735 * #43546 * #43513 * #43373 * #43315

bors merged commit 5f554ed into rust-lang:betaAug 13, 2017

alexcrichton deleted the beta-next branch August 16, 2017 20:12

Navigation Menu

Uh oh!

Uh oh!

Backporting accepted PRs to beta - #43831

Backporting accepted PRs to beta#43831
bors merged 15 commits into
rust-lang:betafrom
alexcrichton:beta-next

alexcrichton commented Aug 12, 2017

Uh oh!

alexcrichton commented Aug 12, 2017

Uh oh!

bors commented Aug 12, 2017

Uh oh!

alexcrichton commented Aug 13, 2017

Uh oh!

bors commented Aug 13, 2017

Uh oh!

ishitatsuyuki commented Aug 13, 2017

Uh oh!

alexcrichton commented Aug 13, 2017

Uh oh!

bors commented Aug 13, 2017

Uh oh!

bors commented Aug 13, 2017

Uh oh!

bors commented Aug 13, 2017

Uh oh!

kennytm commented Aug 13, 2017

Uh oh!

bors commented Aug 13, 2017

Uh oh!

bors commented Aug 13, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Uh oh!

Conversation

alexcrichton commented Aug 12, 2017

Uh oh!

alexcrichton commented Aug 12, 2017

Uh oh!

bors commented Aug 12, 2017

Uh oh!

alexcrichton commented Aug 13, 2017

Uh oh!

bors commented Aug 13, 2017

Uh oh!

ishitatsuyuki commented Aug 13, 2017

Uh oh!

alexcrichton commented Aug 13, 2017

Uh oh!

bors commented Aug 13, 2017

Uh oh!

bors commented Aug 13, 2017

Uh oh!

bors commented Aug 13, 2017

Uh oh!

kennytm commented Aug 13, 2017

Uh oh!

bors commented Aug 13, 2017

Uh oh!

bors commented Aug 13, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants