Skip to content

Commit 34b365f

Browse files
flaper87flaper87
committed
---
yaml --- r: 148877 b: refs/heads/try2 c: c6b1bce h: refs/heads/master i: 148875: ddc5f9f v: v3
1 parent fed773b commit 34b365f

File tree

14 files changed

+61
-102
lines changed

14 files changed

+61
-102
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: fde11e7ae5b9b67dfdf23862f60f4ee4dae4910f
8+
refs/heads/try2: c6b1bce96f25e785d22e976d1cc41cabdae5ea73
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/mk/crates.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
# automatically generated for all stage/host/target combinations.
5050
################################################################################
5151

52-
TARGET_CRATES := std extra green rustuv native flate arena glob term semver
52+
TARGET_CRATES := std extra green rustuv native flate arena glob term
5353
HOST_CRATES := syntax rustc rustdoc
5454
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
5555
TOOLS := compiletest rustdoc rustc
@@ -66,7 +66,6 @@ DEPS_flate := std native:miniz
6666
DEPS_arena := std extra
6767
DEPS_glob := std
6868
DEPS_term := std
69-
DEPS_semver := std
7069

7170
TOOL_DEPS_compiletest := extra green rustuv
7271
TOOL_DEPS_rustdoc := rustdoc green rustuv

‎branches/try2/src/doc/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ li {list-style-type: none; }
4040
* [The `arena` allocation library](arena/index.html)
4141
* [The `flate` compression library](flate/index.html)
4242
* [The `glob` file path matching library](glob/index.html)
43-
* [The `semver` version collation library](semver/index.html)
4443
* [The `term` terminal-handling library](term/index.html)
4544

4645
# Tooling

‎branches/try2/src/libextra/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ pub mod rational;
8383
#[path="num/complex.rs"]
8484
pub mod complex;
8585
pub mod stats;
86+
pub mod semver;
8687
pub mod hex;
8788
pub mod uuid;
8889

‎branches/try2/src/libsemver/lib.rs renamed to ‎branches/try2/src/libextra/semver.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@
2828
//! An example version number with all five components is
2929
//! `0.8.1-rc.3.0+20130922.linux`.
3030
31-
#[crate_id = "semver#0.10-pre"];
32-
#[crate_type = "rlib"];
33-
#[crate_type = "dylib"];
34-
#[license = "MIT/ASL2"];
35-
3631
use std::char;
3732
use std::cmp;
3833
use std::option::{Option, Some, None};

‎branches/try2/src/libextra/sync/mod.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919

2020
use std::cast;
2121
use std::comm;
22+
use std::kinds::marker;
2223
use std::sync::arc::UnsafeArc;
2324
use std::sync::atomics;
2425
use std::unstable::finally::Finally;
2526
use std::util;
26-
use std::util::NonCopyable;
2727

2828
use arc::MutexArc;
2929

@@ -191,7 +191,7 @@ pub struct Condvar<'a> {
191191
// See the comment in write_cond for more detail.
192192
priv order: ReacquireOrderLock<'a>,
193193
// Make sure condvars are non-copyable.
194-
priv token: util::NonCopyable,
194+
priv nopod: marker::NoPod,
195195
}
196196

197197
impl<'a> Condvar<'a> {
@@ -334,7 +334,7 @@ impl Sem<~[WaitQueue]> {
334334
blk(&Condvar {
335335
sem: self,
336336
order: Nothing,
337-
token: NonCopyable
337+
nopod: marker::NoPod
338338
})
339339
})
340340
}
@@ -574,7 +574,7 @@ impl RWLock {
574574
(&self.order_lock).release();
575575
let opt_lock = Just(&self.order_lock);
576576
blk(&Condvar { sem: cond.sem, order: opt_lock,
577-
token: NonCopyable })
577+
nopod: marker::NoPod })
578578
})
579579
}
580580

@@ -609,7 +609,7 @@ impl RWLock {
609609
(&self.access_lock).acquire();
610610
(&self.order_lock).release();
611611
(|| {
612-
blk(RWLockWriteMode { lock: self, token: NonCopyable })
612+
blk(RWLockWriteMode { lock: self, nopod: marker::NoPod })
613613
}).finally(|| {
614614
let writer_or_last_reader;
615615
// Check if we're releasing from read mode or from write mode.
@@ -662,16 +662,16 @@ impl RWLock {
662662
(&self.access_lock).release();
663663
}
664664
}
665-
RWLockReadMode { lock: token.lock, token: NonCopyable }
665+
RWLockReadMode { lock: token.lock, nopod: marker::NoPod }
666666
}
667667
}
668668

669669
/// The "write permission" token used for rwlock.write_downgrade().
670670
671-
pub struct RWLockWriteMode<'a> { priv lock: &'a RWLock, priv token: NonCopyable }
671+
pub struct RWLockWriteMode<'a> { priv lock: &'a RWLock, priv nopod: marker::NoPod }
672672
/// The "read permission" token used for rwlock.write_downgrade().
673673
pub struct RWLockReadMode<'a> { priv lock: &'a RWLock,
674-
priv token: NonCopyable }
674+
priv nopod: marker::NoPod }
675675

676676
impl<'a> RWLockWriteMode<'a> {
677677
/// Access the pre-downgrade rwlock in write mode.
@@ -682,7 +682,7 @@ impl<'a> RWLockWriteMode<'a> {
682682
// access lock. See comment in RWLock::write_cond for why.
683683
blk(&Condvar { sem: &self.lock.access_lock,
684684
order: Just(&self.lock.order_lock),
685-
token: NonCopyable })
685+
nopod: marker::NoPod })
686686
}
687687
}
688688

‎branches/try2/src/libstd/cell.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
1313
use prelude::*;
1414
use cast;
15-
use util::NonCopyable;
16-
use kinds::{marker,Pod};
15+
use kinds::{marker, Pod};
1716

1817
/// A mutable memory location that admits only `Pod` data.
1918
pub struct Cell<T> {
@@ -57,9 +56,9 @@ impl<T:Pod> Clone for Cell<T> {
5756
pub struct RefCell<T> {
5857
priv value: T,
5958
priv borrow: BorrowFlag,
60-
priv nc: NonCopyable,
6159
priv marker1: marker::InvariantType<T>,
6260
priv marker2: marker::NoFreeze,
61+
priv marker3: marker::NoPod,
6362
}
6463

6564
// Values [1, MAX-1] represent the number of `Ref` active
@@ -74,9 +73,9 @@ impl<T> RefCell<T> {
7473
RefCell {
7574
marker1: marker::InvariantType::<T>,
7675
marker2: marker::NoFreeze,
76+
marker3: marker::NoPod,
7777
value: value,
7878
borrow: UNUSED,
79-
nc: NonCopyable
8079
}
8180
}
8281

‎branches/try2/src/libstd/option.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,7 @@ mod tests {
481481
use iter::range;
482482
use str::StrSlice;
483483
use util;
484+
use kinds::marker;
484485
use vec::ImmutableVector;
485486

486487
#[test]
@@ -551,7 +552,7 @@ mod tests {
551552

552553
#[test] #[should_fail]
553554
fn test_option_too_much_dance() {
554-
let mut y = Some(util::NonCopyable);
555+
let mut y = Some(marker::NoPod);
555556
let _y2 = y.take_unwrap();
556557
let _y3 = y.take_unwrap();
557558
}

‎branches/try2/src/libstd/sync/atomics.rs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,40 +23,40 @@
2323

2424
use unstable::intrinsics;
2525
use cast;
26+
use std::kinds::marker;
2627
use option::{Option,Some,None};
2728
use ops::Drop;
28-
use util::NonCopyable;
2929

3030
/**
3131
* A simple atomic flag, that can be set and cleared. The most basic atomic type.
3232
*/
3333
pub struct AtomicFlag {
3434
priv v: int,
35-
priv nocopy: NonCopyable
35+
priv nopod: marker::NoPod
3636
}
3737

3838
/**
3939
* An atomic boolean type.
4040
*/
4141
pub struct AtomicBool {
4242
priv v: uint,
43-
priv nocopy: NonCopyable
43+
priv nopod: marker::NoPod
4444
}
4545

4646
/**
4747
* A signed atomic integer type, supporting basic atomic arithmetic operations
4848
*/
4949
pub struct AtomicInt {
5050
priv v: int,
51-
priv nocopy: NonCopyable
51+
priv nopod: marker::NoPod
5252
}
5353

5454
/**
5555
* An unsigned atomic integer type, supporting basic atomic arithmetic operations
5656
*/
5757
pub struct AtomicUint {
5858
priv v: uint,
59-
priv nocopy: NonCopyable
59+
priv nopod: marker::NoPod
6060
}
6161

6262
/**
@@ -66,7 +66,7 @@ pub struct AtomicUint {
6666
#[cfg(not(stage0))]
6767
pub struct AtomicU64 {
6868
priv v: u64,
69-
priv nocopy: NonCopyable
69+
priv nopod: marker::NoPod
7070
}
7171

7272
/**
@@ -75,12 +75,12 @@ pub struct AtomicU64 {
7575
#[cfg(not(stage0))]
7676
pub struct AtomicPtr<T> {
7777
priv p: uint,
78-
priv nocopy: NonCopyable
78+
priv nopod: marker::NoPod
7979
}
8080
#[cfg(stage0)]
8181
pub struct AtomicPtr<T> {
8282
priv p: *mut T,
83-
priv nocopy: NonCopyable
83+
priv nopod: marker::NoPod
8484
}
8585

8686
/**
@@ -105,17 +105,17 @@ pub enum Ordering {
105105
SeqCst
106106
}
107107

108-
pub static INIT_ATOMIC_FLAG : AtomicFlag = AtomicFlag { v: 0, nocopy: NonCopyable };
109-
pub static INIT_ATOMIC_BOOL : AtomicBool = AtomicBool { v: 0, nocopy: NonCopyable };
110-
pub static INIT_ATOMIC_INT : AtomicInt = AtomicInt { v: 0, nocopy: NonCopyable };
111-
pub static INIT_ATOMIC_UINT : AtomicUint = AtomicUint { v: 0, nocopy: NonCopyable };
108+
pub static INIT_ATOMIC_FLAG : AtomicFlag = AtomicFlag { v: 0, nopod: marker::NoPod };
109+
pub static INIT_ATOMIC_BOOL : AtomicBool = AtomicBool { v: 0, nopod: marker::NoPod };
110+
pub static INIT_ATOMIC_INT : AtomicInt = AtomicInt { v: 0, nopod: marker::NoPod };
111+
pub static INIT_ATOMIC_UINT : AtomicUint = AtomicUint { v: 0, nopod: marker::NoPod };
112112
#[cfg(not(stage0))]
113-
pub static INIT_ATOMIC_U64 : AtomicU64 = AtomicU64 { v: 0, nocopy: NonCopyable };
113+
pub static INIT_ATOMIC_U64 : AtomicU64 = AtomicU64 { v: 0, nopod: marker::NoPod };
114114

115115
impl AtomicFlag {
116116

117117
pub fn new() -> AtomicFlag {
118-
AtomicFlag { v: 0, nocopy: NonCopyable }
118+
AtomicFlag { v: 0, nopod: marker::NoPod}
119119
}
120120

121121
/**
@@ -138,7 +138,7 @@ impl AtomicFlag {
138138

139139
impl AtomicBool {
140140
pub fn new(v: bool) -> AtomicBool {
141-
AtomicBool { v: if v { 1 } else { 0 }, nocopy: NonCopyable }
141+
AtomicBool { v: if v { 1 } else { 0 }, nopod: marker::NoPod }
142142
}
143143

144144
#[inline]
@@ -203,7 +203,7 @@ impl AtomicBool {
203203

204204
impl AtomicInt {
205205
pub fn new(v: int) -> AtomicInt {
206-
AtomicInt { v:v, nocopy: NonCopyable }
206+
AtomicInt { v:v, nopod: marker::NoPod}
207207
}
208208

209209
#[inline]
@@ -242,7 +242,7 @@ impl AtomicInt {
242242
#[cfg(not(stage0))]
243243
impl AtomicU64 {
244244
pub fn new(v: u64) -> AtomicU64 {
245-
AtomicU64 { v:v, nocopy: NonCopyable }
245+
AtomicU64 { v:v, nopod: marker::NoPod }
246246
}
247247

248248
#[inline]
@@ -278,7 +278,7 @@ impl AtomicU64 {
278278

279279
impl AtomicUint {
280280
pub fn new(v: uint) -> AtomicUint {
281-
AtomicUint { v:v, nocopy: NonCopyable }
281+
AtomicUint { v:v, nopod: marker::NoPod }
282282
}
283283

284284
#[inline]
@@ -317,11 +317,11 @@ impl AtomicUint {
317317
impl<T> AtomicPtr<T> {
318318
#[cfg(stage0)]
319319
pub fn new(p: *mut T) -> AtomicPtr<T> {
320-
AtomicPtr { p: p, nocopy: NonCopyable }
320+
AtomicPtr { p: p, nopod: marker::NoPod }
321321
}
322322
#[cfg(not(stage0))]
323323
pub fn new(p: *mut T) -> AtomicPtr<T> {
324-
AtomicPtr { p: p as uint, nocopy: NonCopyable }
324+
AtomicPtr { p: p as uint, nopod: marker::NoPod }
325325
}
326326

327327
#[inline]

‎branches/try2/src/libstd/task.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,14 @@
5656
use any::Any;
5757
use comm::{Chan, Port};
5858
use io::Writer;
59-
use kinds::Send;
59+
use kinds::{Send, marker};
6060
use logging::Logger;
6161
use option::{None, Some, Option};
6262
use result::{Result, Ok, Err};
6363
use rt::local::Local;
6464
use rt::task::Task;
6565
use send_str::{SendStr, IntoSendStr};
6666
use str::Str;
67-
use util;
6867

6968
#[cfg(test)] use any::{AnyOwnExt, AnyRefExt};
7069
#[cfg(test)] use comm::SharedChan;
@@ -126,7 +125,7 @@ pub struct TaskOpts {
126125
pub struct TaskBuilder {
127126
opts: TaskOpts,
128127
priv gen_body: Option<proc(v: proc()) -> proc()>,
129-
priv can_not_copy: Option<util::NonCopyable>,
128+
priv nopod: Option<marker::NoPod>,
130129
}
131130

132131
/**
@@ -138,7 +137,7 @@ pub fn task() -> TaskBuilder {
138137
TaskBuilder {
139138
opts: TaskOpts::new(),
140139
gen_body: None,
141-
can_not_copy: None,
140+
nopod: None,
142141
}
143142
}
144143

0 commit comments

Comments
 (0)