Skip to content

Commit e9e876d

Browse files
CrockAgileCrockAgile
committed
Update panic expressions w/o overflow checks tests
1 parent 59592b1 commit e9e876d

File tree

1 file changed

+26
-52
lines changed

1 file changed

+26
-52
lines changed

‎src/test/incremental/hashes/panic_exprs_no_overflow_checks.rs

Lines changed: 26 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,8 @@ pub fn indexing(slice: &[u8]) -> u8 {
4141
}
4242

4343
#[cfg(not(cfail1))]
44-
#[rustc_clean(label="Hir", cfg="cfail2")]
45-
#[rustc_clean(label="Hir", cfg="cfail3")]
46-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
47-
#[rustc_clean(label="HirBody", cfg="cfail3")]
44+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
45+
#[rustc_clean(cfg="cfail3")]
4846
#[rustc_metadata_clean(cfg="cfail2")]
4947
#[rustc_metadata_clean(cfg="cfail3")]
5048
pub fn indexing(slice: &[u8]) -> u8 {
@@ -60,10 +58,8 @@ pub fn arithmetic_overflow_plus_inherit(val: i32) -> i32 {
6058
}
6159

6260
#[cfg(not(cfail1))]
63-
#[rustc_clean(label="Hir", cfg="cfail2")]
64-
#[rustc_clean(label="Hir", cfg="cfail3")]
65-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
66-
#[rustc_clean(label="HirBody", cfg="cfail3")]
61+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
62+
#[rustc_clean(cfg="cfail3")]
6763
#[rustc_metadata_clean(cfg="cfail2")]
6864
#[rustc_metadata_clean(cfg="cfail3")]
6965
#[rustc_inherit_overflow_checks]
@@ -80,10 +76,8 @@ pub fn arithmetic_overflow_minus_inherit(val: i32) -> i32 {
8076
}
8177

8278
#[cfg(not(cfail1))]
83-
#[rustc_clean(label="Hir", cfg="cfail2")]
84-
#[rustc_clean(label="Hir", cfg="cfail3")]
85-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
86-
#[rustc_clean(label="HirBody", cfg="cfail3")]
79+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
80+
#[rustc_clean(cfg="cfail3")]
8781
#[rustc_metadata_clean(cfg="cfail2")]
8882
#[rustc_metadata_clean(cfg="cfail3")]
8983
#[rustc_inherit_overflow_checks]
@@ -100,10 +94,8 @@ pub fn arithmetic_overflow_mult_inherit(val: i32) -> i32 {
10094
}
10195

10296
#[cfg(not(cfail1))]
103-
#[rustc_clean(label="Hir", cfg="cfail2")]
104-
#[rustc_clean(label="Hir", cfg="cfail3")]
105-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
106-
#[rustc_clean(label="HirBody", cfg="cfail3")]
97+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
98+
#[rustc_clean(cfg="cfail3")]
10799
#[rustc_metadata_clean(cfg="cfail2")]
108100
#[rustc_metadata_clean(cfg="cfail3")]
109101
#[rustc_inherit_overflow_checks]
@@ -120,10 +112,8 @@ pub fn arithmetic_overflow_negation_inherit(val: i32) -> i32 {
120112
}
121113

122114
#[cfg(not(cfail1))]
123-
#[rustc_clean(label="Hir", cfg="cfail2")]
124-
#[rustc_clean(label="Hir", cfg="cfail3")]
125-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
126-
#[rustc_clean(label="HirBody", cfg="cfail3")]
115+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
116+
#[rustc_clean(cfg="cfail3")]
127117
#[rustc_metadata_clean(cfg="cfail2")]
128118
#[rustc_metadata_clean(cfg="cfail3")]
129119
#[rustc_inherit_overflow_checks]
@@ -139,10 +129,8 @@ pub fn division_by_zero(val: i32) -> i32 {
139129
}
140130

141131
#[cfg(not(cfail1))]
142-
#[rustc_clean(label="Hir", cfg="cfail2")]
143-
#[rustc_clean(label="Hir", cfg="cfail3")]
144-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
145-
#[rustc_clean(label="HirBody", cfg="cfail3")]
132+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
133+
#[rustc_clean(cfg="cfail3")]
146134
#[rustc_metadata_clean(cfg="cfail2")]
147135
#[rustc_metadata_clean(cfg="cfail3")]
148136
pub fn division_by_zero(val: i32) -> i32 {
@@ -156,10 +144,8 @@ pub fn mod_by_zero(val: i32) -> i32 {
156144
}
157145

158146
#[cfg(not(cfail1))]
159-
#[rustc_clean(label="Hir", cfg="cfail2")]
160-
#[rustc_clean(label="Hir", cfg="cfail3")]
161-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
162-
#[rustc_clean(label="HirBody", cfg="cfail3")]
147+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
148+
#[rustc_clean(cfg="cfail3")]
163149
#[rustc_metadata_clean(cfg="cfail2")]
164150
#[rustc_metadata_clean(cfg="cfail3")]
165151
pub fn mod_by_zero(val: i32) -> i32 {
@@ -177,10 +163,8 @@ pub fn bitwise(val: i32) -> i32 {
177163
}
178164

179165
#[cfg(not(cfail1))]
180-
#[rustc_clean(label="Hir", cfg="cfail2")]
181-
#[rustc_clean(label="Hir", cfg="cfail3")]
182-
#[rustc_clean(label="HirBody", cfg="cfail2")]
183-
#[rustc_clean(label="HirBody", cfg="cfail3")]
166+
#[rustc_clean(cfg="cfail2")]
167+
#[rustc_clean(cfg="cfail3")]
184168
#[rustc_metadata_clean(cfg="cfail2")]
185169
#[rustc_metadata_clean(cfg="cfail3")]
186170
pub fn bitwise(val: i32) -> i32 {
@@ -195,10 +179,8 @@ pub fn logical(val1: bool, val2: bool, val3: bool) -> bool {
195179
}
196180

197181
#[cfg(not(cfail1))]
198-
#[rustc_clean(label="Hir", cfg="cfail2")]
199-
#[rustc_clean(label="Hir", cfg="cfail3")]
200-
#[rustc_clean(label="HirBody", cfg="cfail2")]
201-
#[rustc_clean(label="HirBody", cfg="cfail3")]
182+
#[rustc_clean(cfg="cfail2")]
183+
#[rustc_clean(cfg="cfail3")]
202184
#[rustc_metadata_clean(cfg="cfail2")]
203185
#[rustc_metadata_clean(cfg="cfail3")]
204186
pub fn logical(val1: bool, val2: bool, val3: bool) -> bool {
@@ -212,10 +194,8 @@ pub fn arithmetic_overflow_plus(val: i32) -> i32 {
212194
}
213195

214196
#[cfg(not(cfail1))]
215-
#[rustc_clean(label="Hir", cfg="cfail2")]
216-
#[rustc_clean(label="Hir", cfg="cfail3")]
217-
#[rustc_clean(label="HirBody", cfg="cfail2")]
218-
#[rustc_clean(label="HirBody", cfg="cfail3")]
197+
#[rustc_clean(cfg="cfail2")]
198+
#[rustc_clean(cfg="cfail3")]
219199
#[rustc_metadata_clean(cfg="cfail2")]
220200
#[rustc_metadata_clean(cfg="cfail3")]
221201
pub fn arithmetic_overflow_plus(val: i32) -> i32 {
@@ -230,10 +210,8 @@ pub fn arithmetic_overflow_minus(val: i32) -> i32 {
230210
}
231211

232212
#[cfg(not(cfail1))]
233-
#[rustc_clean(label="Hir", cfg="cfail2")]
234-
#[rustc_clean(label="Hir", cfg="cfail3")]
235-
#[rustc_clean(label="HirBody", cfg="cfail2")]
236-
#[rustc_clean(label="HirBody", cfg="cfail3")]
213+
#[rustc_clean(cfg="cfail2")]
214+
#[rustc_clean(cfg="cfail3")]
237215
#[rustc_metadata_clean(cfg="cfail2")]
238216
#[rustc_metadata_clean(cfg="cfail3")]
239217
pub fn arithmetic_overflow_minus(val: i32) -> i32 {
@@ -248,10 +226,8 @@ pub fn arithmetic_overflow_mult(val: i32) -> i32 {
248226
}
249227

250228
#[cfg(not(cfail1))]
251-
#[rustc_clean(label="Hir", cfg="cfail2")]
252-
#[rustc_clean(label="Hir", cfg="cfail3")]
253-
#[rustc_clean(label="HirBody", cfg="cfail2")]
254-
#[rustc_clean(label="HirBody", cfg="cfail3")]
229+
#[rustc_clean(cfg="cfail2")]
230+
#[rustc_clean(cfg="cfail3")]
255231
#[rustc_metadata_clean(cfg="cfail2")]
256232
#[rustc_metadata_clean(cfg="cfail3")]
257233
pub fn arithmetic_overflow_mult(val: i32) -> i32 {
@@ -266,10 +242,8 @@ pub fn arithmetic_overflow_negation(val: i32) -> i32 {
266242
}
267243

268244
#[cfg(not(cfail1))]
269-
#[rustc_clean(label="Hir", cfg="cfail2")]
270-
#[rustc_clean(label="Hir", cfg="cfail3")]
271-
#[rustc_clean(label="HirBody", cfg="cfail2")]
272-
#[rustc_clean(label="HirBody", cfg="cfail3")]
245+
#[rustc_clean(cfg="cfail2")]
246+
#[rustc_clean(cfg="cfail3")]
273247
#[rustc_metadata_clean(cfg="cfail2")]
274248
#[rustc_metadata_clean(cfg="cfail3")]
275249
pub fn arithmetic_overflow_negation(val: i32) -> i32 {

0 commit comments

Comments
 (0)