about summary refs log tree commit diff
path: root/src/test/codegen
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-12-14 22:02:59 +0000
committerbors <bors@rust-lang.org>2019-12-14 22:02:59 +0000
commit6f829840f7e5897745bc7b5ff951b006a2c4e0e3 (patch)
tree0c73bcad1ba6245af90566e58a69def359b598cd /src/test/codegen
parentc8ea4ace9213ae045123fdfeb59d1ac887656d31 (diff)
parent775076ff4dc9ce4986a1286669cfa268b01ac592 (diff)
downloadrust-6f829840f7e5897745bc7b5ff951b006a2c4e0e3.tar.gz
rust-6f829840f7e5897745bc7b5ff951b006a2c4e0e3.zip
Auto merge of #67224 - nikomatsakis:revert-stabilization-of-never-type, r=centril
Revert stabilization of never type

Fixes https://github.com/rust-lang/rust/issues/66757

I decided to keep the separate `never-type-fallback` feature gate, but tried to otherwise revert https://github.com/rust-lang/rust/pull/65355. Seemed pretty clean.

( cc @Centril, author of #65355, you may want to check this over briefly )
Diffstat (limited to 'src/test/codegen')
-rw-r--r--src/test/codegen/enum-debug-niche-2.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/codegen/enum-debug-niche-2.rs b/src/test/codegen/enum-debug-niche-2.rs
index 7e00dc5463f..0f17976ef49 100644
--- a/src/test/codegen/enum-debug-niche-2.rs
+++ b/src/test/codegen/enum-debug-niche-2.rs
@@ -12,6 +12,8 @@
 // CHECK: {{.*}}DIDerivedType{{.*}}tag: DW_TAG_member,{{.*}}name: "Placeholder",{{.*}}extraData: i64 4294967295{{[,)].*}}
 // CHECK: {{.*}}DIDerivedType{{.*}}tag: DW_TAG_member,{{.*}}name: "Error",{{.*}}extraData: i64 0{{[,)].*}}
 
+#![feature(never_type)]
+
 #[derive(Copy, Clone)]
 pub struct Entity {
     private: std::num::NonZeroU32,