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.

Author: bors

.travis.yml

@@ -1,4 +1,4 @@
-language: generic
+language: shell
 sudo: required
 dist: trusty
 services:

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

@@ -109,7 +109,6 @@
  - [collection_placement](library-features/collection-placement.md)
  - [collections_range](library-features/collections-range.md)
  - [collections](library-features/collections.md)
- - [command_envs](library-features/command-envs.md)
  - [compiler_builtins_lib](library-features/compiler-builtins-lib.md)
  - [compiler_fences](library-features/compiler-fences.md)
  - [concat_idents_macro](library-features/concat-idents-macro.md)
@@ -169,7 +168,6 @@
  - [once_poison](library-features/once-poison.md)
  - [oom](library-features/oom.md)
  - [option_entry](library-features/option-entry.md)
- - [osstring_shrink_to_fit](library-features/osstring-shrink-to-fit.md)
  - [panic_abort](library-features/panic-abort.md)
  - [panic_unwind](library-features/panic-unwind.md)
  - [pattern](library-features/pattern.md)
@@ -181,7 +179,6 @@
  - [rand](library-features/rand.md)
  - [range_contains](library-features/range-contains.md)
  - [raw](library-features/raw.md)
- - [reverse_cmp_key](library-features/reverse-cmp-key.md)
  - [rt](library-features/rt.md)
  - [rustc_private](library-features/rustc-private.md)
  - [sanitizer_runtime_lib](library-features/sanitizer-runtime-lib.md)
@@ -203,7 +200,6 @@
  - [str_box_extras](library-features/str-box-extras.md)
  - [str_mut_extras](library-features/str-mut-extras.md)
  - [test](library-features/test.md)
- - [thread_id](library-features/thread-id.md)
  - [thread_local_internals](library-features/thread-local-internals.md)
  - [thread_local_state](library-features/thread-local-state.md)
  - [toowned_clone_into](library-features/toowned-clone-into.md)

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

@@ -335,18 +335,17 @@ impl Ordering {
 /// Example usage:
 ///
 /// ```
-/// #![feature(reverse_cmp_key)]
 /// use std::cmp::Reverse;
 ///
 /// let mut v = vec![1, 2, 3, 4, 5, 6];
 /// v.sort_by_key(|&num| (num > 3, Reverse(num)));
 /// assert_eq!(v, vec![3, 2, 1, 6, 5, 4]);
 /// ```
 #[derive(PartialEq, Eq, Debug)]
-#[unstable(feature = "reverse_cmp_key", issue = "40893")]
-pub struct Reverse<T>(pub T);
+#[stable(feature = "reverse_cmp_key", since = "1.19.0")]
+pub struct Reverse<T>(#[stable(feature = "reverse_cmp_key", since = "1.19.0")] pub T);
 
-#[unstable(feature = "reverse_cmp_key", issue = "40893")]
+#[stable(feature = "reverse_cmp_key", since = "1.19.0")]
 impl<T: PartialOrd> PartialOrd for Reverse<T> {
  #[inline]
  fn partial_cmp(&self, other: &Reverse<T>) -> Option<Ordering> {
@@ -363,7 +362,7 @@ impl<T: PartialOrd> PartialOrd for Reverse<T> {
  fn gt(&self, other: &Self) -> bool { other.0 > self.0 }
 }
 
-#[unstable(feature = "reverse_cmp_key", issue = "40893")]
+#[stable(feature = "reverse_cmp_key", since = "1.19.0")]
 impl<T: Ord> Ord for Reverse<T> {
  #[inline]
  fn cmp(&self, other: &Reverse<T>) -> Ordering {

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

@@ -35,7 +35,6 @@
 #![feature(slice_patterns)]
 #![feature(unicode)]
 #![feature(conservative_impl_trait)]
-#![feature(command_envs)]
 
 #![cfg_attr(stage0, unstable(feature = "rustc_private", issue = "27812"))]
 #![cfg_attr(stage0, feature(rustc_private))]

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

@@ -163,8 +163,12 @@ pub fn test(input: &str, cfgs: Vec<String>, libs: SearchPaths, externs: Externs,
  true, opts, maybe_sysroot, None,
  Some(input.to_owned()),
  render_type);
- old_find_testable_code(&input_str, &mut collector, DUMMY_SP);
- find_testable_code(&input_str, &mut collector, DUMMY_SP);
+ if render_type == RenderType::Pulldown {
+ old_find_testable_code(&input_str, &mut collector, DUMMY_SP);
+ find_testable_code(&input_str, &mut collector, DUMMY_SP);
+ } else {
+ old_find_testable_code(&input_str, &mut collector, DUMMY_SP);
+ }
  test_args.insert(0, "rustdoctest".to_string());
  testing::test_main(&test_args, collector.tests,
  testing::Options::new().display_output(display_warnings));

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

@@ -230,8 +230,6 @@ impl OsString {
  /// # Examples
  ///
  /// ```
- /// #![feature(osstring_shrink_to_fit)]
- ///
  /// use std::ffi::OsString;
  ///
  /// let mut s = OsString::from("foo");
@@ -242,7 +240,7 @@ impl OsString {
  /// s.shrink_to_fit();
  /// assert_eq!(3, s.capacity());
  /// ```
- #[unstable(feature = "osstring_shrink_to_fit", issue = "40421")]
+ #[stable(feature = "osstring_shrink_to_fit", since = "1.19.0")]
  pub fn shrink_to_fit(&mut self) {
  self.inner.shrink_to_fit()
  }