Merge remote-tracking branch 'upstream/master' into rustup

1 files changed, 0 insertions, 27 deletions

diff --git a/src/docs/empty_enum.txt b/src/docs/empty_enum.txt
deleted file mode 100644
index f7b41c41ee5..00000000000
--- a/src/docs/empty_enum.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-### What it does
-Checks for `enum`s with no variants.
-
-As of this writing, the `never_type` is still a
-nightly-only experimental API. Therefore, this lint is only triggered
-if the `never_type` is enabled.
-
-### Why is this bad?
-If you want to introduce a type which
-can't be instantiated, you should use `!` (the primitive type "never"),
-or a wrapper around it, because `!` has more extensive
-compiler support (type inference, etc...) and wrappers
-around it are the conventional way to define an uninhabited type.
-For further information visit [never type documentation](https://doc.rust-lang.org/std/primitive.never.html)
-
-
-### Example
-```
-enum Test {}
-```
-
-Use instead:
-```
-#![feature(never_type)]
-
-struct Test(!);
-```
\ No newline at end of file