Skip to content

Commit 17da4c7

Browse files
author
Jakub Wieczorek
committed
Remove virtual struct tests
1 parent 403cd40 commit 17da4c7

12 files changed

+1
-323
lines changed

src/test/compile-fail/inherit-struct1.rs

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/test/compile-fail/inherit-struct2.rs

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/test/compile-fail/inherit-struct3.rs

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/test/compile-fail/inherit-struct4.rs

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/test/compile-fail/inherit-struct5.rs

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/test/compile-fail/inherit-struct6.rs

Lines changed: 0 additions & 42 deletions
This file was deleted.

src/test/compile-fail/inherit-struct7.rs

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/test/compile-fail/inherit-struct8.rs

Lines changed: 0 additions & 34 deletions
This file was deleted.

src/test/compile-fail/inherit-struct9.rs

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/test/debuginfo/simple-struct.rs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@
7575
// gdb-command:print 'simple-struct::PADDING_AT_END'
7676
// gdb-check:$18 = {x = -27, y = 28}
7777

78-
// gdb-command:print inheriting
79-
// gdb-check:$19 = {a = 10019, b = -10020, x = -10016, y = -10017.5, z = 10018}
80-
8178

8279
// === LLDB TESTS ==================================================================================
8380

@@ -101,7 +98,6 @@
10198
// lldb-command:print padding_at_end
10299
// lldb-check:[...]$5 = PaddingAtEnd { x: -10014, y: 10015 }
103100

104-
#![feature(struct_inherit)];
105101
#![allow(unused_variable)];
106102
#![allow(dead_code)];
107103

@@ -110,7 +106,7 @@ struct NoPadding16 {
110106
y: i16
111107
}
112108

113-
virtual struct NoPadding32 {
109+
struct NoPadding32 {
114110
x: i32,
115111
y: f32,
116112
z: u32
@@ -173,11 +169,6 @@ static mut PADDING_AT_END: PaddingAtEnd = PaddingAtEnd {
173169
y: 14
174170
};
175171

176-
struct Inheriting : NoPadding32 {
177-
a: u16,
178-
b: i16
179-
}
180-
181172
fn main() {
182173
let no_padding16 = NoPadding16 { x: 10000, y: -10001 };
183174
let no_padding32 = NoPadding32 { x: -10002, y: -10003.5, z: 10004 };
@@ -187,8 +178,6 @@ fn main() {
187178
let internal_padding = InternalPadding { x: 10012, y: -10013 };
188179
let padding_at_end = PaddingAtEnd { x: -10014, y: 10015 };
189180

190-
let inheriting = Inheriting { a: 10019, b: -10020, x: -10016, y: -10017.5, z: 10018 };
191-
192181
unsafe {
193182
NO_PADDING_16.x = 100;
194183
NO_PADDING_16.y = -101;

src/test/run-pass/inherit-struct1.rs

Lines changed: 0 additions & 61 deletions
This file was deleted.

src/test/run-pass/inherit-struct2.rs

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)