3dcd215740
This breaks code that referred to variant names in the same namespace as
their enum. Reexport the variants in the old location or alter code to
refer to the new locations:
```
pub enum Foo {
A,
B
}
fn main() {
let a = A;
}
```
=>
```
pub use self::Foo::{A, B};
pub enum Foo {
A,
B
}
fn main() {
let a = A;
}
```
or
```
pub enum Foo {
A,
B
}
fn main() {
let a = Foo::A;
}
```
[breaking-change]
122 lines
3.4 KiB
Rust
122 lines
3.4 KiB
Rust
// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
|
|
// ignore-tidy-linelength
|
|
// ignore-android: FIXME(#10381)
|
|
// min-lldb-version: 310
|
|
|
|
// compile-flags:-g
|
|
|
|
// === GDB TESTS ===================================================================================
|
|
|
|
// gdb-command:run
|
|
|
|
// gdb-command:print some
|
|
// gdb-check:$1 = {RUST$ENCODED$ENUM$0$None = {0x12345678}}
|
|
|
|
// gdb-command:print none
|
|
// gdb-check:$2 = {RUST$ENCODED$ENUM$0$None = {0x0}}
|
|
|
|
// gdb-command:print full
|
|
// gdb-check:$3 = {RUST$ENCODED$ENUM$1$Empty = {454545, 0x87654321, 9988}}
|
|
|
|
// gdb-command:print empty_gdb->discr
|
|
// gdb-check:$4 = (int *) 0x0
|
|
|
|
// gdb-command:print droid
|
|
// gdb-check:$5 = {RUST$ENCODED$ENUM$2$Void = {id = 675675, range = 10000001, internals = 0x43218765}}
|
|
|
|
// gdb-command:print void_droid_gdb->internals
|
|
// gdb-check:$6 = (int *) 0x0
|
|
|
|
// gdb-command:continue
|
|
|
|
|
|
// === LLDB TESTS ==================================================================================
|
|
|
|
// lldb-command:run
|
|
|
|
// lldb-command:print some
|
|
// lldb-check:[...]$0 = Some(&0x12345678)
|
|
|
|
// lldb-command:print none
|
|
// lldb-check:[...]$1 = None
|
|
|
|
// lldb-command:print full
|
|
// lldb-check:[...]$2 = Full(454545, &0x87654321, 9988)
|
|
|
|
// lldb-command:print empty
|
|
// lldb-check:[...]$3 = Empty
|
|
|
|
// lldb-command:print droid
|
|
// lldb-check:[...]$4 = Droid { id: 675675, range: 10000001, internals: &0x43218765 }
|
|
|
|
// lldb-command:print void_droid
|
|
// lldb-check:[...]$5 = Void
|
|
|
|
|
|
#![feature(struct_variant)]
|
|
|
|
// If a struct has exactly two variants, one of them is empty, and the other one
|
|
// contains a non-nullable pointer, then this value is used as the discriminator.
|
|
// The test cases in this file make sure that something readable is generated for
|
|
// this kind of types.
|
|
// If the non-empty variant contains a single non-nullable pointer than the whole
|
|
// item is represented as just a pointer and not wrapped in a struct.
|
|
// Unfortunately (for these test cases) the content of the non-discriminant fields
|
|
// in the null-case is not defined. So we just read the discriminator field in
|
|
// this case (by casting the value to a memory-equivalent struct).
|
|
|
|
enum MoreFields<'a> {
|
|
Full(u32, &'a int, i16),
|
|
Empty
|
|
}
|
|
|
|
struct MoreFieldsRepr<'a> {
|
|
a: u32,
|
|
discr: &'a int,
|
|
b: i16
|
|
}
|
|
|
|
enum NamedFields<'a> {
|
|
Droid { id: i32, range: i64, internals: &'a int },
|
|
Void
|
|
}
|
|
|
|
struct NamedFieldsRepr<'a> {
|
|
id: i32,
|
|
range: i64,
|
|
internals: &'a int
|
|
}
|
|
|
|
fn main() {
|
|
|
|
let some: Option<&u32> = Some(unsafe { std::mem::transmute(0x12345678u) });
|
|
let none: Option<&u32> = None;
|
|
|
|
let full = MoreFields::Full(454545, unsafe { std::mem::transmute(0x87654321u) }, 9988);
|
|
|
|
let empty = MoreFields::Empty;
|
|
let empty_gdb: &MoreFieldsRepr = unsafe { std::mem::transmute(&MoreFields::Empty) };
|
|
|
|
let droid = NamedFields::Droid {
|
|
id: 675675,
|
|
range: 10000001,
|
|
internals: unsafe { std::mem::transmute(0x43218765u) }
|
|
};
|
|
|
|
let void_droid = NamedFields::Void;
|
|
let void_droid_gdb: &NamedFieldsRepr = unsafe { std::mem::transmute(&NamedFields::Void) };
|
|
|
|
zzz(); // #break
|
|
}
|
|
|
|
fn zzz() {()}
|