Merge from rustc

5 files changed, 0 insertions, 37 deletions

diff --git a/src/doc/book b/src/doc/book
-Subproject f1e5ad844d0c61738006cdef26227beeb136948
+Subproject aa5ee485bd6bd80d205da7c82fcdd776f92fdd5
diff --git a/src/doc/reference b/src/doc/reference
-Subproject f6ed74f582bddcec73f753eafaab3749c4f7df6
+Subproject 4ea7c5def38ac81df33a9e48e5637a82a5ac404
diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example
-Subproject 5e7b296d6c345addbd748f242aae28c42555c01
+Subproject 03491f33375c5a2a1661c7fa4be671fe95ce124
diff --git a/src/doc/rustc-dev-guide b/src/doc/rustc-dev-guide
-Subproject 7518c3445dc02df0d196f5f84e568d633c5141f
+Subproject 51a37ad19a15709d0601afbac6581f5aea6a45d
diff --git a/src/doc/unstable-book/src/language-features/arbitrary-enum-discriminant.md b/src/doc/unstable-book/src/language-features/arbitrary-enum-discriminant.md
deleted file mode 100644
index e0bb782270e..00000000000
--- a/src/doc/unstable-book/src/language-features/arbitrary-enum-discriminant.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# `arbitrary_enum_discriminant`
-
-The tracking issue for this feature is: [#60553]
-
-[#60553]: https://github.com/rust-lang/rust/issues/60553
-
-------------------------
-
-The `arbitrary_enum_discriminant` feature permits tuple-like and
-struct-like enum variants with `#[repr(<int-type>)]` to have explicit discriminants.
-
-## Examples
-
-```rust
-#![feature(arbitrary_enum_discriminant)]
-
-#[allow(dead_code)]
-#[repr(u8)]
-enum Enum {
-    Unit = 3,
-    Tuple(u16) = 2,
-    Struct {
-        a: u8,
-        b: u16,
-    } = 1,
-}
-
-impl Enum {
-    fn tag(&self) -> u8 {
-        unsafe { *(self as *const Self as *const u8) }
-    }
-}
-
-assert_eq!(3, Enum::Unit.tag());
-assert_eq!(2, Enum::Tuple(5).tag());
-assert_eq!(1, Enum::Struct{a: 7, b: 11}.tag());
-```