diff options
| author | bors <bors@rust-lang.org> | 2015-01-17 20:31:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-17 20:31:08 +0000 |
| commit | f4f10dba2975b51c2d2c92157018db3ac13d4d4a (patch) | |
| tree | 54bad6d9f9d3472c424b02ec91ff508a81ea1ffa /src/libcore/prelude.rs | |
| parent | 89c4e3792ddc5b45706ea0e919806a248f7a87c3 (diff) | |
| parent | 6553c0f5eb7cb903b698431556ade4e954dcb4e6 (diff) | |
| download | rust-f4f10dba2975b51c2d2c92157018db3ac13d4d4a.tar.gz rust-f4f10dba2975b51c2d2c92157018db3ac13d4d4a.zip | |
auto merge of #21300 : steveklabnik/rust/rollup, r=steveklabnik
manual rollup to fix some conflicts and diagnose why the test is failing...
Diffstat (limited to 'src/libcore/prelude.rs')
| -rw-r--r-- | src/libcore/prelude.rs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/libcore/prelude.rs b/src/libcore/prelude.rs index c3bb9c91557..da3f180d7e1 100644 --- a/src/libcore/prelude.rs +++ b/src/libcore/prelude.rs @@ -21,11 +21,7 @@ //! # Example //! //! ```ignore -//! # fn main() { -//! #![feature(globs)] -//! //! use core::prelude::*; -//! # } //! ``` // Reexported core operators |