Skip to content

Commit 1551f2c

Browse files
borsbors
committed
---
yaml --- r: 120575 b: refs/heads/dist-snap c: 9ac9148 h: refs/heads/master i: 120573: aa94aa9 120571: cb7a819 120567: bcd7adc 120559: a0fc86f 120543: 0a4bc29 120511: bd9a0aa 120447: 53309f3 120319: 10db871 v: v3
1 parent e60d0a9 commit 1551f2c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+850
-627
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 1813e5aa1a03b0596b8de7abd1af31edf5d6098f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: dcc2305664ab9101513f5d6b40941ed4ffea47f5
9+
refs/heads/dist-snap: 9ac9148bbddcaeaf6c1b6b8f2e8bae75b038f234
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

‎branches/dist-snap/mk/target.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
7474
$$(CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(4)) \
7575
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
7676
| $$(TLIB$(1)_T_$(2)_H_$(3))/
77-
@$$(call E, oxidize: $$(@D)/lib$(4))
77+
@$$(call E, rustc: $$(@D)/lib$(4))
7878
$$(call REMOVE_ALL_OLD_GLOB_MATCHES,\
7979
$$(dir $$@)$$(call CFG_LIB_GLOB_$(2),$(4)))
8080
$$(call REMOVE_ALL_OLD_GLOB_MATCHES,\
@@ -114,7 +114,7 @@ $$(TBIN$(1)_T_$(2)_H_$(3))/$(4)$$(X_$(2)): \
114114
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(dep)) \
115115
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
116116
| $$(TBIN$(1)_T_$(4)_H_$(3))/
117-
@$$(call E, oxidize: $$@)
117+
@$$(call E, rustc: $$@)
118118
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --cfg $(4)
119119

120120
endef

‎branches/dist-snap/mk/tests.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ $(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): CFG_COMPILER_HOST_TRIPLE = $(2)
372372
$(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): \
373373
$$(CRATEFILE_$(4)) \
374374
$$(TESTDEP_$(1)_$(2)_$(3)_$(4))
375-
@$$(call E, oxidize: $$@)
375+
@$$(call E, rustc: $$@)
376376
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test \
377377
-L "$$(RT_OUTPUT_DIR_$(2))" \
378378
-L "$$(LLVM_LIBDIR_$(2))"

‎branches/dist-snap/src/etc/vim/syntax/rust.vim

Lines changed: 43 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,40 @@ syn keyword rustOperator as
1818

1919
syn match rustAssert "\<assert\(\w\)*!" contained
2020
syn match rustFail "\<fail\(\w\)*!" contained
21-
syn keyword rustKeyword break box continue
22-
syn keyword rustKeyword extern nextgroup=rustExternCrate,rustObsoleteExternMod skipwhite
21+
syn keyword rustKeyword break
22+
syn keyword rustKeyword box nextgroup=rustBoxPlacement skipwhite skipempty
23+
syn keyword rustKeyword continue
24+
syn keyword rustKeyword extern nextgroup=rustExternCrate,rustObsoleteExternMod skipwhite skipempty
25+
syn keyword rustKeyword fn nextgroup=rustFuncName skipwhite skipempty
2326
syn keyword rustKeyword for in if impl let
24-
syn keyword rustKeyword loop once priv pub
25-
syn keyword rustKeyword return
26-
syn keyword rustKeyword unsafe while
27-
syn keyword rustKeyword use nextgroup=rustModPath skipwhite
27+
syn keyword rustKeyword loop once proc pub
28+
syn keyword rustKeyword return super
29+
syn keyword rustKeyword unsafe virtual while
30+
syn keyword rustKeyword use nextgroup=rustModPath skipwhite skipempty
2831
" FIXME: Scoped impl's name is also fallen in this category
29-
syn keyword rustKeyword mod trait struct enum type nextgroup=rustIdentifier skipwhite
30-
syn keyword rustKeyword fn nextgroup=rustFuncName skipwhite
31-
syn keyword rustKeyword proc
32+
syn keyword rustKeyword mod trait struct enum type nextgroup=rustIdentifier skipwhite skipempty
3233
syn keyword rustStorage mut ref static
3334
syn keyword rustObsoleteStorage const
3435

3536
syn keyword rustInvalidBareKeyword crate
3637

37-
syn keyword rustExternCrate crate contained nextgroup=rustIdentifier skipwhite
38-
syn keyword rustObsoleteExternMod mod contained nextgroup=rustIdentifier skipwhite
38+
syn keyword rustExternCrate crate contained nextgroup=rustIdentifier skipwhite skipempty
39+
syn keyword rustObsoleteExternMod mod contained nextgroup=rustIdentifier skipwhite skipempty
3940

4041
syn match rustIdentifier contains=rustIdentifierPrime "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
4142
syn match rustFuncName "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
4243

44+
syn region rustBoxPlacement matchgroup=rustBoxPlacementParens start="(" end=")" contains=TOP contained
45+
syn keyword rustBoxPlacementExpr GC containedin=rustBoxPlacement
46+
" Ideally we'd have syntax rules set up to match arbitrary expressions. Since
47+
" we don't, we'll just define temporary contained rules to handle balancing
48+
" delimiters.
49+
syn region rustBoxPlacementBalance start="(" end=")" containedin=rustBoxPlacement transparent
50+
syn region rustBoxPlacementBalance start="\[" end="\]" containedin=rustBoxPlacement transparent
51+
" {} are handled by rustFoldBraces
52+
4353
" Reserved (but not yet used) keywords {{{2
44-
syn keyword rustReservedKeyword alignof be do offsetof pure sizeof typeof yield
54+
syn keyword rustReservedKeyword alignof be do offsetof priv pure sizeof typeof unsized yield
4555

4656
" Built-in types {{{2
4757
syn keyword rustType int uint float char bool u8 u16 u32 u64 f32
@@ -52,10 +62,10 @@ syn keyword rustType f64 i8 i16 i32 i64 str Self
5262
" to make it easy to update.
5363

5464
" Core operators {{{3
55-
syn keyword rustTrait Share Copy Send Sized
65+
syn keyword rustTrait Copy Send Sized Share
5666
syn keyword rustTrait Add Sub Mul Div Rem Neg Not
5767
syn keyword rustTrait BitAnd BitOr BitXor
58-
syn keyword rustTrait Drop
68+
syn keyword rustTrait Drop Deref DerefMut
5969
syn keyword rustTrait Shl Shr Index
6070
syn keyword rustEnum Option
6171
syn keyword rustEnumVariant Some None
@@ -68,7 +78,6 @@ syn keyword rustEnumVariant Ok Err
6878
"syn keyword rustFunction drop
6979

7080
" Types and traits {{{3
71-
syn keyword rustTrait Any AnyOwnExt AnyRefExt AnyMutRefExt
7281
syn keyword rustTrait Ascii AsciiCast OwnedAsciiCast AsciiStr IntoBytes
7382
syn keyword rustTrait ToCStr
7483
syn keyword rustTrait Char
@@ -80,25 +89,32 @@ syn keyword rustTrait FromIterator Extendable
8089
syn keyword rustTrait Iterator DoubleEndedIterator RandomAccessIterator CloneableIterator
8190
syn keyword rustTrait OrdIterator MutableDoubleEndedIterator ExactSize
8291
syn keyword rustTrait Num NumCast CheckedAdd CheckedSub CheckedMul
83-
syn keyword rustTrait Signed Unsigned Round
84-
syn keyword rustTrait Primitive Int Float ToPrimitive FromPrimitive
92+
syn keyword rustTrait Signed Unsigned
93+
syn keyword rustTrait Primitive Int Float FloatMath ToPrimitive FromPrimitive
94+
"syn keyword rustTrait Expect
95+
syn keyword rustTrait Box
8596
syn keyword rustTrait GenericPath Path PosixPath WindowsPath
8697
syn keyword rustTrait RawPtr
8798
syn keyword rustTrait Buffer Writer Reader Seek
88-
syn keyword rustTrait Str StrVector StrSlice OwnedStr IntoMaybeOwned StrBuf
99+
syn keyword rustTrait Str StrVector StrSlice OwnedStr IntoMaybeOwned
100+
syn keyword rustTrait StrAllocating
89101
syn keyword rustTrait ToStr IntoStr
90102
syn keyword rustTrait Tuple1 Tuple2 Tuple3 Tuple4
91103
syn keyword rustTrait Tuple5 Tuple6 Tuple7 Tuple8
92104
syn keyword rustTrait Tuple9 Tuple10 Tuple11 Tuple12
93-
syn keyword rustTrait ImmutableEqVector ImmutableTotalOrdVector ImmutableCloneableVector
94-
syn keyword rustTrait OwnedVector OwnedCloneableVector OwnedEqVector
95-
syn keyword rustTrait MutableVector MutableTotalOrdVector
96-
syn keyword rustTrait Vector VectorVector CloneableVector ImmutableVector
97-
98-
"syn keyword rustFunction stream
99-
syn keyword rustTrait Sender Receiver
105+
syn keyword rustTrait CloneableVector ImmutableCloneableVector MutableCloneableVector
106+
syn keyword rustTrait ImmutableVector MutableVector
107+
syn keyword rustTrait ImmutableEqVector ImmutableTotalOrdVector MutableTotalOrdVector
108+
syn keyword rustTrait Vector VectorVector OwnedVector MutableVectorAllocating
109+
syn keyword rustTrait StrBuf
110+
syn keyword rustTrait Vec
111+
112+
"syn keyword rustFunction sync_channel channel
113+
syn keyword rustTrait SyncSender Sender Receiver
100114
"syn keyword rustFunction spawn
101115

116+
"syn keyword rustConstant GC
117+
102118
syn keyword rustSelf self
103119
syn keyword rustBoolean true false
104120

@@ -239,6 +255,8 @@ hi def link rustLifetime Special
239255
hi def link rustInvalidBareKeyword Error
240256
hi def link rustExternCrate rustKeyword
241257
hi def link rustObsoleteExternMod Error
258+
hi def link rustBoxPlacementParens Delimiter
259+
hi def link rustBoxPlacementExpr rustKeyword
242260

243261
" Other Suggestions:
244262
" hi rustAttribute ctermfg=cyan

‎branches/dist-snap/src/liballoc/heap.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// FIXME: #13994: port to the sized deallocation API when available
12-
// FIXME: #13996: need a way to mark the `allocate` and `reallocate` return values as `noalias`
12+
// FIXME: #13996: mark the `allocate` and `reallocate` return value as `noalias` and `nonnull`
1313

1414
use core::intrinsics::{abort, cttz32};
1515
use core::option::{None, Option};
@@ -119,14 +119,8 @@ pub fn stats_print() {
119119
/// The allocator for unique pointers.
120120
#[cfg(not(test))]
121121
#[lang="exchange_malloc"]
122-
#[inline(always)]
123-
pub unsafe fn exchange_malloc_(size: uint, align: uint) -> *mut u8 {
124-
exchange_malloc(size, align)
125-
}
126-
127-
/// The allocator for unique pointers.
128122
#[inline]
129-
pub unsafe fn exchange_malloc(size: uint, align: uint) -> *mut u8 {
123+
unsafe fn exchange_malloc(size: uint, align: uint) -> *mut u8 {
130124
// The compiler never calls `exchange_free` on ~ZeroSizeType, so zero-size
131125
// allocations can point to this `static`. It would be incorrect to use a null
132126
// pointer, due to enums assuming types like unique pointers are never null.
@@ -139,14 +133,20 @@ pub unsafe fn exchange_malloc(size: uint, align: uint) -> *mut u8 {
139133
}
140134
}
141135

142-
#[cfg(not(test))]
136+
#[cfg(not(test), stage0)]
143137
#[lang="exchange_free"]
144138
#[inline]
145-
// FIXME: #13994 (rustc should pass align and size here)
146139
unsafe fn exchange_free(ptr: *mut u8) {
147140
deallocate(ptr, 0, 8);
148141
}
149142

143+
#[cfg(not(test), not(stage0))]
144+
#[lang="exchange_free"]
145+
#[inline]
146+
unsafe fn exchange_free(ptr: *mut u8, size: uint, align: uint) {
147+
deallocate(ptr, size, align);
148+
}
149+
150150
// FIXME: #7496
151151
#[cfg(not(test))]
152152
#[lang="closure_exchange_malloc"]
@@ -167,16 +167,16 @@ unsafe fn closure_exchange_malloc(drop_glue: fn(*mut u8), size: uint, align: uin
167167
#[doc(hidden)]
168168
#[deprecated]
169169
#[cfg(not(test))]
170-
pub unsafe extern "C" fn rust_malloc(size: uint, align: uint) -> *mut u8 {
171-
exchange_malloc(size, align)
170+
pub unsafe extern "C" fn rust_allocate(size: uint, align: uint) -> *mut u8 {
171+
allocate(size, align)
172172
}
173173

174174
// hack for libcore
175175
#[no_mangle]
176176
#[doc(hidden)]
177177
#[deprecated]
178178
#[cfg(not(test))]
179-
pub unsafe extern "C" fn rust_free(ptr: *mut u8, size: uint, align: uint) {
179+
pub unsafe extern "C" fn rust_deallocate(ptr: *mut u8, size: uint, align: uint) {
180180
deallocate(ptr, size, align)
181181
}
182182

‎branches/dist-snap/src/libarena/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use std::mem;
3838
use std::num;
3939
use std::ptr::read;
4040
use std::rc::Rc;
41-
use std::rt::heap::exchange_malloc;
41+
use std::rt::heap::allocate;
4242

4343
// The way arena uses arrays is really deeply awful. The arrays are
4444
// allocated, and have capacities reserved, but the fill for the array
@@ -358,8 +358,7 @@ impl<T> TypedArenaChunk<T> {
358358
size = size.checked_add(&elems_size).unwrap();
359359

360360
let mut chunk = unsafe {
361-
let chunk = exchange_malloc(size,
362-
mem::min_align_of::<TypedArenaChunk<T>>());
361+
let chunk = allocate(size, mem::min_align_of::<TypedArenaChunk<T>>());
363362
let mut chunk: Box<TypedArenaChunk<T>> = mem::transmute(chunk);
364363
mem::overwrite(&mut chunk.next, next);
365364
chunk

‎branches/dist-snap/src/libcore/should_not_exist.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ use str::StrSlice;
4444

4545
#[allow(ctypes)]
4646
extern {
47-
fn rust_malloc(size: uint, align: uint) -> *u8;
48-
fn rust_free(ptr: *u8, size: uint, align: uint);
47+
fn rust_allocate(size: uint, align: uint) -> *u8;
48+
fn rust_deallocate(ptr: *u8, size: uint, align: uint);
4949
}
5050

5151
unsafe fn alloc(cap: uint) -> *mut Vec<()> {
5252
let cap = cap.checked_add(&mem::size_of::<Vec<()>>()).unwrap();
5353
// this should use the real alignment, but the new representation will take care of that
54-
let ret = rust_malloc(cap, 8) as *mut Vec<()>;
54+
let ret = rust_allocate(cap, 8) as *mut Vec<()>;
5555
if ret.is_null() {
5656
intrinsics::abort();
5757
}
@@ -119,7 +119,7 @@ impl FromIterator<char> for ~str {
119119
&(*ptr).data,
120120
len);
121121
// FIXME: #13994: port to the sized deallocation API when available
122-
rust_free(ptr as *u8, 0, 8);
122+
rust_deallocate(ptr as *u8, 0, 8);
123123
mem::forget(ret);
124124
ret = mem::transmute(ptr2);
125125
ptr = ptr2;
@@ -191,7 +191,7 @@ impl<A: Clone> Clone for ~[A] {
191191
for j in range(0, *i as int) {
192192
ptr::read(&*p.offset(j));
193193
}
194-
rust_free(ret as *u8, 0, 8);
194+
rust_deallocate(ret as *u8, 0, 8);
195195
});
196196
mem::transmute(ret)
197197
}

‎branches/dist-snap/src/libgreen/basic.rs

Lines changed: 19 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
//! This implementation is also used as the fallback implementation of an event
1616
//! loop if no other one is provided (and M:N scheduling is desired).
1717
18+
use alloc::arc::Arc;
19+
use std::sync::atomics;
1820
use std::mem;
1921
use std::rt::rtio::{EventLoop, IoFactory, RemoteCallback};
2022
use std::rt::rtio::{PausableIdleCallback, Callback};
@@ -27,10 +29,11 @@ pub fn event_loop() -> Box<EventLoop:Send> {
2729

2830
struct BasicLoop {
2931
work: Vec<proc():Send>, // pending work
30-
idle: Option<*mut BasicPausable>, // only one is allowed
3132
remotes: Vec<(uint, Box<Callback:Send>)>,
3233
next_remote: uint,
3334
messages: Exclusive<Vec<Message>>,
35+
idle: Option<Box<Callback:Send>>,
36+
idle_active: Option<Arc<atomics::AtomicBool>>,
3437
}
3538

3639
enum Message { RunRemote(uint), RemoveRemote(uint) }
@@ -40,6 +43,7 @@ impl BasicLoop {
4043
BasicLoop {
4144
work: vec![],
4245
idle: None,
46+
idle_active: None,
4347
next_remote: 0,
4448
remotes: vec![],
4549
messages: Exclusive::new(vec![]),
@@ -92,20 +96,18 @@ impl BasicLoop {
9296

9397
/// Run the idle callback if one is registered
9498
fn idle(&mut self) {
95-
unsafe {
96-
match self.idle {
97-
Some(idle) => {
98-
if (*idle).active {
99-
(*idle).work.call();
100-
}
99+
match self.idle {
100+
Some(ref mut idle) => {
101+
if self.idle_active.get_ref().load(atomics::SeqCst) {
102+
idle.call();
101103
}
102-
None => {}
103104
}
105+
None => {}
104106
}
105107
}
106108

107109
fn has_idle(&self) -> bool {
108-
unsafe { self.idle.is_some() && (**self.idle.get_ref()).active }
110+
self.idle.is_some() && self.idle_active.get_ref().load(atomics::SeqCst)
109111
}
110112
}
111113

@@ -141,13 +143,11 @@ impl EventLoop for BasicLoop {
141143
// FIXME: Seems like a really weird requirement to have an event loop provide.
142144
fn pausable_idle_callback(&mut self, cb: Box<Callback:Send>)
143145
-> Box<PausableIdleCallback:Send> {
144-
let callback = box BasicPausable::new(self, cb);
145146
rtassert!(self.idle.is_none());
146-
unsafe {
147-
let cb_ptr: &*mut BasicPausable = mem::transmute(&callback);
148-
self.idle = Some(*cb_ptr);
149-
}
150-
callback as Box<PausableIdleCallback:Send>
147+
self.idle = Some(cb);
148+
let a = Arc::new(atomics::AtomicBool::new(true));
149+
self.idle_active = Some(a.clone());
150+
box BasicPausable { active: a } as Box<PausableIdleCallback:Send>
151151
}
152152

153153
fn remote_callback(&mut self, f: Box<Callback:Send>)
@@ -196,35 +196,21 @@ impl Drop for BasicRemote {
196196
}
197197

198198
struct BasicPausable {
199-
eloop: *mut BasicLoop,
200-
work: Box<Callback:Send>,
201-
active: bool,
202-
}
203-
204-
impl BasicPausable {
205-
fn new(eloop: &mut BasicLoop, cb: Box<Callback:Send>) -> BasicPausable {
206-
BasicPausable {
207-
active: false,
208-
work: cb,
209-
eloop: eloop,
210-
}
211-
}
199+
active: Arc<atomics::AtomicBool>,
212200
}
213201

214202
impl PausableIdleCallback for BasicPausable {
215203
fn pause(&mut self) {
216-
self.active = false;
204+
self.active.store(false, atomics::SeqCst);
217205
}
218206
fn resume(&mut self) {
219-
self.active = true;
207+
self.active.store(true, atomics::SeqCst);
220208
}
221209
}
222210

223211
impl Drop for BasicPausable {
224212
fn drop(&mut self) {
225-
unsafe {
226-
(*self.eloop).idle = None;
227-
}
213+
self.active.store(false, atomics::SeqCst);
228214
}
229215
}
230216

0 commit comments

Comments
 (0)