Skip to content

Commit 83000c2

Browse files
authored
Rollup merge of rust-lang#65981 - RalfJung:check-your-gates, r=Centril
work around aggressive syntax feature gating This works around rust-lang#65860; fixing `rustc +nightly lib.rs --test --edition 2018` for libcore and thus unblocking https://github.com/RalfJung/miri-test-libstd.
2 parents 30ed544 + 4819cba commit 83000c2

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

src/libcore/lib.rs

+12
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@
133133
#[allow(unused)]
134134
use prelude::v1::*;
135135

136+
#[cfg(not(test))] // See #65860
136137
#[macro_use]
137138
mod macros;
138139

@@ -180,40 +181,51 @@ pub mod hint;
180181

181182
/* Core language traits */
182183

184+
#[cfg(not(test))] // See #65860
183185
pub mod marker;
184186
pub mod ops;
187+
#[cfg(not(test))] // See #65860
185188
pub mod cmp;
189+
#[cfg(not(test))] // See #65860
186190
pub mod clone;
191+
#[cfg(not(test))] // See #65860
187192
pub mod default;
188193
pub mod convert;
189194
pub mod borrow;
190195

191196
/* Core types and methods on primitives */
192197

193198
pub mod any;
199+
#[cfg(not(test))] // See #65860
194200
pub mod array;
195201
pub mod ascii;
196202
pub mod sync;
197203
pub mod cell;
198204
pub mod char;
199205
pub mod panic;
200206
pub mod panicking;
207+
#[cfg(not(test))] // See #65860
201208
pub mod pin;
209+
#[cfg(not(test))] // See #65860
202210
pub mod iter;
203211
pub mod option;
204212
pub mod raw;
205213
pub mod result;
206214
pub mod ffi;
207215

208216
pub mod slice;
217+
#[cfg(not(test))] // See #65860
209218
pub mod str;
219+
#[cfg(not(test))] // See #65860
210220
pub mod hash;
221+
#[cfg(not(test))] // See #65860
211222
pub mod fmt;
212223
pub mod time;
213224

214225
pub mod unicode;
215226

216227
/* Async */
228+
#[cfg(not(test))] // See #65860
217229
pub mod future;
218230
pub mod task;
219231

0 commit comments

Comments
 (0)