Skip to content

Commit 731c733

Browse files
committed
---
yaml --- r: 184046 b: refs/heads/auto c: f5491e6 h: refs/heads/master v: v3
1 parent a717055 commit 731c733

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
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 74199c24d0c09d5096eba1c1da7ce2d85a207d4b
13+
refs/heads/auto: f5491e63b4a4389aded637b872b7e02180b9585b
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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)