Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stabilize more APIs for the 1.20.0 release #43373

Merged
merged 8 commits into from Jul 27, 2017

Conversation

Projects
None yet
7 participants
@alexcrichton
Copy link
Member

alexcrichton commented Jul 20, 2017

In addition to the few stabilizations that have already landed, this cleans up the remaining APIs that are in final-comment-period right now to be stable by the 1.20.0 release

@alexcrichton

This comment has been minimized.

Copy link
Member Author

alexcrichton commented Jul 20, 2017

Note that I've explicitly omitted RangeArgument as I believe there's still activity happening on that.

@alexcrichton

This comment has been minimized.

Copy link
Member Author

alexcrichton commented Jul 20, 2017

r? @aturon

@alexcrichton

This comment has been minimized.

Copy link
Member Author

alexcrichton commented Jul 20, 2017

(or @sfackler)

@@ -445,6 +444,8 @@ declare_features! (
// Allows the definition of associated constants in `trait` or `impl`
// blocks.
(accepted, associated_consts, "1.20.0", Some(29646)),
// Usage of the `compile_error!` macro
(accepted, compile_error, "1.20.0", Some(40872)),

This comment has been minimized.

@kennytm

kennytm Jul 21, 2017

Member
[00:04:22] error[E0026]: struct `feature_gate::Features` does not have a field named `compile_error`
[00:04:22]     --> /checkout/src/libsyntax/ext/expand.rs:1044:35
[00:04:22]      |
[00:04:22] 1013 | |                      Some(&Features { $field: true, .. }) => true,
[00:04:22]      | |__________________________________________________^ struct `feature_gate::Features` does not have field `compile_error`
[00:04:22] ...
[00:04:22] 1034 | |/     feature_tests! {
[00:04:22] 1035 | ||         fn enable_quotes = quote,
[00:04:22] 1036 | ||         fn enable_asm = asm,
[00:04:22] 1037 | ||         fn enable_global_asm = global_asm,
[00:04:22] ...    ||
[00:04:22] 1044 |  |         fn enable_compile_error = compile_error,
[00:04:22]      |  |___________________________________^
[00:04:22] 1045 |  |     }
[00:04:22]      |  |_____- in this macro invocation
[00:04:22] 
[00:04:22] error: aborting due to previous error(s)
[00:04:22] 
[00:04:22] error: Could not compile `syntax`.

@alexcrichton alexcrichton force-pushed the alexcrichton:stabilize-1.20.0 branch 2 times, most recently from 79866b6 to b8ce384 Jul 21, 2017

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 22, 2017

☔️ The latest upstream changes (presumably #43367) made this pull request unmergeable. Please resolve the merge conflicts.

@alexcrichton alexcrichton force-pushed the alexcrichton:stabilize-1.20.0 branch from b8ce384 to 093d38c Jul 23, 2017

@aturon

This comment has been minimized.

Copy link
Member

aturon commented Jul 25, 2017

LGTM. Fire at will.

@kennytm

This comment has been minimized.

Copy link
Member

kennytm commented Jul 25, 2017

libstd doc tests failed.

[01:04:15] ---- ffi/c_str.rs - ffi::c_str::CStr::into_c_string (line 1003) stdout ----
[01:04:15] 	error: this feature has been stable since 1.20.0. Attribute no longer needed
[01:04:15]  --> <anon>:1:12
[01:04:15]   |
[01:04:15] 1 | #![feature(into_boxed_c_str)]
[01:04:15]   |            ^^^^^^^^^^^^^^^^
[01:04:15]   |
...
[01:04:15] failures:
[01:04:15]     ffi/c_str.rs - ffi::c_str::CStr::into_c_string (line 1003)
[01:04:15]     ffi/c_str.rs - ffi::c_str::CString::as_c_str (line 455)
[01:04:15]     ffi/c_str.rs - ffi::c_str::CString::into_boxed_c_str (line 476)
[01:04:15]     ffi/os_str.rs - ffi::os_str::OsString::into_boxed_os_str (line 254)

alexcrichton added some commits Jul 20, 2017

std: Stabilize `char_escape_debug`
Stabilizes:

* `<char>::escape_debug`
* `std::char::EscapeDebug`

Closes #35068
std: Stabilize `option_entry` feature
Stabilized:

* `Option::get_or_insert`
* `Option::get_or_insert_with`

Closes #39288
std: Stabilize `str_checked_slicing` feature
Stabilized

* `<str>::get`
* `<str>::get_mut`
* `<str>::get_unchecked`
* `<str>::get_unchecked_mut`

Closes #39932
std: Stabilize CString/OsString/PathBuf extra methods
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`

Closes #40380
std: Stabilize `utf8_error_error_len` feature
Stabilizes:

* `Utf8Error::error_len`

Closes #40494
std: Stabilize `manually_drop` feature
Stabilizes

* `core::mem::ManuallyDrop`
* `std::mem::ManuallyDrop`
* `ManuallyDrop::new`
* `ManuallyDrop::into_inner`
* `ManuallyDrop::drop`
* `Deref for ManuallyDrop`
* `DerefMut for ManuallyDrop`

Closes #40673
Stabilize the `compile_error_macro` feature
Stabilizes:

* `compile_error!` as a macro defined by rustc

Closes #40872
std: Stabilize the `str_{mut,box}_extras` feature
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`

Closes #41119

@alexcrichton alexcrichton force-pushed the alexcrichton:stabilize-1.20.0 branch from 093d38c to 16707d4 Jul 25, 2017

@alexcrichton

This comment has been minimized.

Copy link
Member Author

alexcrichton commented Jul 25, 2017

@bors: r=aturon

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 25, 2017

📌 Commit 16707d4 has been approved by aturon

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 26, 2017

⌛️ Testing commit 16707d4 with merge de2eada...

bors added a commit that referenced this pull request Jul 26, 2017

Auto merge of #43373 - alexcrichton:stabilize-1.20.0, r=aturon
Stabilize more APIs for the 1.20.0 release

In addition to the few stabilizations that have already landed, this cleans up the remaining APIs that are in `final-comment-period` right now to be stable by the 1.20.0 release
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 26, 2017

💔 Test failed - status-travis

@kennytm

This comment has been minimized.

Copy link
Member

kennytm commented Jul 26, 2017

x86_64-gnu-aux, #43453, spurious.

@Mark-Simulacrum

This comment has been minimized.

Copy link
Member

Mark-Simulacrum commented Jul 26, 2017

@bors retry - #43453 RLS tests

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 26, 2017

⌛️ Testing commit 16707d4 with merge ddaab61...

bors added a commit that referenced this pull request Jul 26, 2017

Auto merge of #43373 - alexcrichton:stabilize-1.20.0, r=aturon
Stabilize more APIs for the 1.20.0 release

In addition to the few stabilizations that have already landed, this cleans up the remaining APIs that are in `final-comment-period` right now to be stable by the 1.20.0 release
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 27, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: aturon
Pushing ddaab61 to master...

@bors bors merged commit 16707d4 into rust-lang:master Jul 27, 2017

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details

@bors bors referenced this pull request Jul 27, 2017

Merged

Generator support #43076

7 of 7 tasks complete
@XAMPPRocky

This comment has been minimized.

Copy link
Contributor

XAMPPRocky commented Aug 4, 2017

@alexcrichton What does mean for impl SliceIndex<str> for Range* being stable when the SliceIndex trait is still unstable?

@alexcrichton alexcrichton deleted the alexcrichton:stabilize-1.20.0 branch Aug 5, 2017

@alexcrichton

This comment has been minimized.

Copy link
Member Author

alexcrichton commented Aug 5, 2017

@Aaronepower oh that's actually mostly irrelevant in terms of stabilization, the real stabilization here is methods like str::get that consume these impls.

bors added a commit that referenced this pull request Aug 13, 2017

Auto merge of #43831 - alexcrichton:beta-next, r=alexcrichton
Backporting accepted PRs to beta

Backport of:

* #43735
* #43546
* #43513
* #43373
* #43315

bors added a commit that referenced this pull request Aug 13, 2017

Auto merge of #43831 - alexcrichton:beta-next, r=alexcrichton
Backporting accepted PRs to beta

Backport of:

* #43735
* #43546
* #43513
* #43373
* #43315

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Jan 4, 2018

Rollup merge of rust-lang#47030 - ollie27:stab, r=alexcrichton
Correct a few stability attributes

* The extra impls for `ManuallyDrop` were added in rust-lang#44310 which was only stabilised in 1.22.0.
* The impls for `SliceIndex` were stabilised in rust-lang#43373 but as `RangeInclusive` and `RangeToInclusive` are still unstable the impls should remain unstable.
* The `From` impls for atomic integers were added in rust-lang#45610 but most atomic integers are still unstable.
* The `shared_from_slice2` impls were added in rust-lang#45990 but they won't be stable until 1.24.0.
* The `Mutex` and `RwLock` impls were added in rust-lang#46082 but won't be stable until 1.24.0.

kennytm added a commit to kennytm/rust that referenced this pull request Jan 4, 2018

Rollup merge of rust-lang#47030 - ollie27:stab, r=alexcrichton
Correct a few stability attributes

* The extra impls for `ManuallyDrop` were added in rust-lang#44310 which was only stabilised in 1.22.0.
* The impls for `SliceIndex` were stabilised in rust-lang#43373 but as `RangeInclusive` and `RangeToInclusive` are still unstable the impls should remain unstable.
* The `From` impls for atomic integers were added in rust-lang#45610 but most atomic integers are still unstable.
* The `shared_from_slice2` impls were added in rust-lang#45990 but they won't be stable until 1.24.0.
* The `Mutex` and `RwLock` impls were added in rust-lang#46082 but won't be stable until 1.24.0.

kennytm added a commit to kennytm/rust that referenced this pull request Jan 5, 2018

Rollup merge of rust-lang#47030 - ollie27:stab, r=alexcrichton
Correct a few stability attributes

* The extra impls for `ManuallyDrop` were added in rust-lang#44310 which was only stabilised in 1.22.0.
* The impls for `SliceIndex` were stabilised in rust-lang#43373 but as `RangeInclusive` and `RangeToInclusive` are still unstable the impls should remain unstable.
* The `From` impls for atomic integers were added in rust-lang#45610 but most atomic integers are still unstable.
* The `shared_from_slice2` impls were added in rust-lang#45990 but they won't be stable until 1.24.0.
* The `Mutex` and `RwLock` impls were added in rust-lang#46082 but won't be stable until 1.24.0.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.