Skip to content

Commit 8537f4e

Browse files
committed
Auto merge of #43114 - brson:beta-next, r=brson
[beta] backports - #43068 - #43043 - #42745 The pick of 143206d in cfa3b58 was not clean and needed a fair bit of surgery. It should probably be looked at closely. Still testing locally.
2 parents 4b6f4f3 + 1d4b2e2 commit 8537f4e

File tree

13 files changed

+15
-57
lines changed

13 files changed

+15
-57
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
language: generic
1+
language: shell
22
sudo: required
33
dist: trusty
44
services:

src/doc/unstable-book/src/SUMMARY.md

-4
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@
109109
- [collection_placement](library-features/collection-placement.md)
110110
- [collections_range](library-features/collections-range.md)
111111
- [collections](library-features/collections.md)
112-
- [command_envs](library-features/command-envs.md)
113112
- [compiler_builtins_lib](library-features/compiler-builtins-lib.md)
114113
- [compiler_fences](library-features/compiler-fences.md)
115114
- [concat_idents_macro](library-features/concat-idents-macro.md)
@@ -169,7 +168,6 @@
169168
- [once_poison](library-features/once-poison.md)
170169
- [oom](library-features/oom.md)
171170
- [option_entry](library-features/option-entry.md)
172-
- [osstring_shrink_to_fit](library-features/osstring-shrink-to-fit.md)
173171
- [panic_abort](library-features/panic-abort.md)
174172
- [panic_unwind](library-features/panic-unwind.md)
175173
- [pattern](library-features/pattern.md)
@@ -181,7 +179,6 @@
181179
- [rand](library-features/rand.md)
182180
- [range_contains](library-features/range-contains.md)
183181
- [raw](library-features/raw.md)
184-
- [reverse_cmp_key](library-features/reverse-cmp-key.md)
185182
- [rt](library-features/rt.md)
186183
- [rustc_private](library-features/rustc-private.md)
187184
- [sanitizer_runtime_lib](library-features/sanitizer-runtime-lib.md)
@@ -203,7 +200,6 @@
203200
- [str_box_extras](library-features/str-box-extras.md)
204201
- [str_mut_extras](library-features/str-mut-extras.md)
205202
- [test](library-features/test.md)
206-
- [thread_id](library-features/thread-id.md)
207203
- [thread_local_internals](library-features/thread-local-internals.md)
208204
- [thread_local_state](library-features/thread-local-state.md)
209205
- [toowned_clone_into](library-features/toowned-clone-into.md)

src/doc/unstable-book/src/library-features/command-envs.md

-7
This file was deleted.

src/doc/unstable-book/src/library-features/osstring-shrink-to-fit.md

-7
This file was deleted.

src/doc/unstable-book/src/library-features/reverse-cmp-key.md

-7
This file was deleted.

src/doc/unstable-book/src/library-features/thread-id.md

-7
This file was deleted.

src/libcore/cmp.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -335,18 +335,17 @@ impl Ordering {
335335
/// Example usage:
336336
///
337337
/// ```
338-
/// #![feature(reverse_cmp_key)]
339338
/// use std::cmp::Reverse;
340339
///
341340
/// let mut v = vec![1, 2, 3, 4, 5, 6];
342341
/// v.sort_by_key(|&num| (num > 3, Reverse(num)));
343342
/// assert_eq!(v, vec![3, 2, 1, 6, 5, 4]);
344343
/// ```
345344
#[derive(PartialEq, Eq, Debug)]
346-
#[unstable(feature = "reverse_cmp_key", issue = "40893")]
347-
pub struct Reverse<T>(pub T);
345+
#[stable(feature = "reverse_cmp_key", since = "1.19.0")]
346+
pub struct Reverse<T>(#[stable(feature = "reverse_cmp_key", since = "1.19.0")] pub T);
348347

349-
#[unstable(feature = "reverse_cmp_key", issue = "40893")]
348+
#[stable(feature = "reverse_cmp_key", since = "1.19.0")]
350349
impl<T: PartialOrd> PartialOrd for Reverse<T> {
351350
#[inline]
352351
fn partial_cmp(&self, other: &Reverse<T>) -> Option<Ordering> {
@@ -363,7 +362,7 @@ impl<T: PartialOrd> PartialOrd for Reverse<T> {
363362
fn gt(&self, other: &Self) -> bool { other.0 > self.0 }
364363
}
365364

366-
#[unstable(feature = "reverse_cmp_key", issue = "40893")]
365+
#[stable(feature = "reverse_cmp_key", since = "1.19.0")]
367366
impl<T: Ord> Ord for Reverse<T> {
368367
#[inline]
369368
fn cmp(&self, other: &Reverse<T>) -> Ordering {

src/librustc_trans/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#![feature(slice_patterns)]
3636
#![feature(unicode)]
3737
#![feature(conservative_impl_trait)]
38-
#![feature(command_envs)]
3938

4039
#![cfg_attr(stage0, unstable(feature = "rustc_private", issue = "27812"))]
4140
#![cfg_attr(stage0, feature(rustc_private))]

src/librustdoc/markdown.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,12 @@ pub fn test(input: &str, cfgs: Vec<String>, libs: SearchPaths, externs: Externs,
163163
true, opts, maybe_sysroot, None,
164164
Some(input.to_owned()),
165165
render_type);
166-
old_find_testable_code(&input_str, &mut collector, DUMMY_SP);
167-
find_testable_code(&input_str, &mut collector, DUMMY_SP);
166+
if render_type == RenderType::Pulldown {
167+
old_find_testable_code(&input_str, &mut collector, DUMMY_SP);
168+
find_testable_code(&input_str, &mut collector, DUMMY_SP);
169+
} else {
170+
old_find_testable_code(&input_str, &mut collector, DUMMY_SP);
171+
}
168172
test_args.insert(0, "rustdoctest".to_string());
169173
testing::test_main(&test_args, collector.tests,
170174
testing::Options::new().display_output(display_warnings));

src/libstd/ffi/os_str.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,6 @@ impl OsString {
230230
/// # Examples
231231
///
232232
/// ```
233-
/// #![feature(osstring_shrink_to_fit)]
234-
///
235233
/// use std::ffi::OsString;
236234
///
237235
/// let mut s = OsString::from("foo");
@@ -242,7 +240,7 @@ impl OsString {
242240
/// s.shrink_to_fit();
243241
/// assert_eq!(3, s.capacity());
244242
/// ```
245-
#[unstable(feature = "osstring_shrink_to_fit", issue = "40421")]
243+
#[stable(feature = "osstring_shrink_to_fit", since = "1.19.0")]
246244
pub fn shrink_to_fit(&mut self) {
247245
self.inner.shrink_to_fit()
248246
}

src/libstd/process.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -440,8 +440,6 @@ impl Command {
440440
/// Basic usage:
441441
///
442442
/// ```no_run
443-
/// #![feature(command_envs)]
444-
///
445443
/// use std::process::{Command, Stdio};
446444
/// use std::env;
447445
/// use std::collections::HashMap;
@@ -459,7 +457,7 @@ impl Command {
459457
/// .spawn()
460458
/// .expect("printenv failed to start");
461459
/// ```
462-
#[unstable(feature = "command_envs", issue = "38526")]
460+
#[stable(feature = "command_envs", since = "1.19.0")]
463461
pub fn envs<I, K, V>(&mut self, vars: I) -> &mut Command
464462
where I: IntoIterator<Item=(K, V)>, K: AsRef<OsStr>, V: AsRef<OsStr>
465463
{

src/libstd/thread/mod.rs

+2-8
Original file line numberDiff line numberDiff line change
@@ -821,8 +821,6 @@ pub fn park_timeout(dur: Duration) {
821821
/// # Examples
822822
///
823823
/// ```
824-
/// #![feature(thread_id)]
825-
///
826824
/// use std::thread;
827825
///
828826
/// let other_thread = thread::spawn(|| {
@@ -832,7 +830,7 @@ pub fn park_timeout(dur: Duration) {
832830
/// let other_thread_id = other_thread.join().unwrap();
833831
/// assert!(thread::current().id() != other_thread_id);
834832
/// ```
835-
#[unstable(feature = "thread_id", issue = "21507")]
833+
#[stable(feature = "thread_id", since = "1.19.0")]
836834
#[derive(Eq, PartialEq, Clone, Copy, Hash, Debug)]
837835
pub struct ThreadId(u64);
838836

@@ -962,8 +960,6 @@ impl Thread {
962960
/// # Examples
963961
///
964962
/// ```
965-
/// #![feature(thread_id)]
966-
///
967963
/// use std::thread;
968964
///
969965
/// let other_thread = thread::spawn(|| {
@@ -973,7 +969,7 @@ impl Thread {
973969
/// let other_thread_id = other_thread.join().unwrap();
974970
/// assert!(thread::current().id() != other_thread_id);
975971
/// ```
976-
#[unstable(feature = "thread_id", issue = "21507")]
972+
#[stable(feature = "thread_id", since = "1.19.0")]
977973
pub fn id(&self) -> ThreadId {
978974
self.inner.id
979975
}
@@ -1164,8 +1160,6 @@ impl<T> JoinHandle<T> {
11641160
/// # Examples
11651161
///
11661162
/// ```
1167-
/// #![feature(thread_id)]
1168-
///
11691163
/// use std::thread;
11701164
///
11711165
/// let builder = thread::Builder::new();

src/test/run-pass/process-envs.rs

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
// ignore-emscripten
1212

13-
#![feature(command_envs)]
14-
1513
use std::process::Command;
1614
use std::env;
1715
use std::collections::HashMap;

0 commit comments

Comments
 (0)