Skip to content

Commit e524158

Browse files
committed
---
yaml --- r: 183949 b: refs/heads/master c: f5491e6 h: refs/heads/master i: 183947: d222f6d v: v3
1 parent 319da28 commit e524158

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 74199c24d0c09d5096eba1c1da7ce2d85a207d4b
2+
refs/heads/master: f5491e63b4a4389aded637b872b7e02180b9585b
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 522d09dfecbeca1595f25ac58c6d0178bbd21d7d
55
refs/heads/try: ccf8fedf1cffcb8f6f3581d53d220039e192fe77

trunk/src/libcore/marker.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ pub unsafe trait Send: 'static {
4141
// empty.
4242
}
4343
/// Types able to be transferred across thread boundaries.
44-
#[unstable(feature = "core",
45-
reason = "will be overhauled with new lifetime rules; see RFC 458")]
44+
#[stable(feature = "rust1", since = "1.0.0")]
4645
#[lang="send"]
4746
#[rustc_on_unimplemented = "`{Self}` cannot be sent between threads safely"]
4847
#[cfg(not(stage0))]
@@ -208,8 +207,7 @@ pub trait Copy : MarkerTrait {
208207
/// around the value(s) which can be mutated when behind a `&`
209208
/// reference; not doing this is undefined behaviour (for example,
210209
/// `transmute`-ing from `&T` to `&mut T` is illegal).
211-
#[unstable(feature = "core",
212-
reason = "will be overhauled with new lifetime rules; see RFC 458")]
210+
#[stable(feature = "rust1", since = "1.0.0")]
213211
#[lang="sync"]
214212
#[rustc_on_unimplemented = "`{Self}` cannot be shared between threads safely"]
215213
pub unsafe trait Sync : MarkerTrait {

0 commit comments

Comments
 (0)