Skip to content

Commit 656a9ce

Browse files
committed
---
yaml --- r: 233575 b: refs/heads/beta c: 5990249 h: refs/heads/master i: 233573: 33d1046 233571: 7f346c3 233567: b9082b3 v: v3
1 parent 1dd07ac commit 656a9ce

File tree

3 files changed

+20
-19
lines changed

3 files changed

+20
-19
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 0c849de1a2bad4b63b15b0155ecef8758f5211e5
26+
refs/heads/beta: 5990249e48efe285fb37be104697af7e68cb3013
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/libcore/prelude/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@
1010

1111
//! The libcore prelude
1212
13+
#![stable(feature = "core_prelude", since = "1.4.0")]
14+
1315
pub mod v1;

branches/beta/src/libcore/prelude/v1.rs

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,26 @@
1414
//! well. This module is imported by default when `#![no_std]` is used in the
1515
//! same manner as the standard library's prelude.
1616
17-
#![unstable(feature = "core_prelude",
18-
reason = "the libcore prelude has not been scrutinized and \
19-
stabilized yet",
20-
issue = "27701")]
17+
#![stable(feature = "core_prelude", since = "1.4.0")]
2118

2219
// Reexported core operators
23-
pub use marker::{Copy, Send, Sized, Sync};
24-
pub use ops::{Drop, Fn, FnMut, FnOnce};
20+
#[doc(no_inline)] pub use marker::{Copy, Send, Sized, Sync};
21+
#[doc(no_inline)] pub use ops::{Drop, Fn, FnMut, FnOnce};
2522

2623
// Reexported functions
27-
pub use mem::drop;
24+
#[doc(no_inline)] pub use mem::drop;
2825

2926
// Reexported types and traits
30-
pub use char::CharExt;
31-
pub use clone::Clone;
32-
pub use cmp::{PartialEq, PartialOrd, Eq, Ord};
33-
pub use convert::{AsRef, AsMut, Into, From};
34-
pub use default::Default;
35-
pub use iter::IntoIterator;
36-
pub use iter::{Iterator, DoubleEndedIterator, Extend, ExactSizeIterator};
37-
pub use option::Option::{self, Some, None};
38-
pub use result::Result::{self, Ok, Err};
39-
pub use slice::SliceExt;
40-
pub use str::StrExt;
27+
#[doc(no_inline)] pub use clone::Clone;
28+
#[doc(no_inline)] pub use cmp::{PartialEq, PartialOrd, Eq, Ord};
29+
#[doc(no_inline)] pub use convert::{AsRef, AsMut, Into, From};
30+
#[doc(no_inline)] pub use default::Default;
31+
#[doc(no_inline)] pub use iter::{Iterator, Extend, IntoIterator};
32+
#[doc(no_inline)] pub use iter::{DoubleEndedIterator, ExactSizeIterator};
33+
#[doc(no_inline)] pub use option::Option::{self, Some, None};
34+
#[doc(no_inline)] pub use result::Result::{self, Ok, Err};
35+
36+
// Reexported extension traits for primitive types
37+
#[doc(no_inline)] pub use slice::SliceExt;
38+
#[doc(no_inline)] pub use str::StrExt;
39+
#[doc(no_inline)] pub use char::CharExt;

0 commit comments

Comments
 (0)