Skip to content

Commit e971290

Browse files
brsonbrson
committed
---
yaml --- r: 63521 b: refs/heads/snap-stage3 c: 7a9a6e4 h: refs/heads/master i: 63519: e5a1bf6 v: v3
1 parent 8d8ef8d commit e971290

Some content is hidden

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

41 files changed

+3205
-972
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 41e90f2156236d8b4a0ab74e3ed9aadaa7d11d58
4+
refs/heads/snap-stage3: 7a9a6e45911636eae3ec4e1c111bc0e120601a5a
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,9 @@ CFG_ADB_TEST_DIR=/data/tmp
122122
$(info check: android device test dir $(CFG_ADB_TEST_DIR) ready \
123123
$(shell adb remount 1>/dev/null) \
124124
$(shell adb shell mkdir $(CFG_ADB_TEST_DIR) 1>/dev/null) \
125-
$(shell adb shell rm -rf $(CFG_ADB_TEST_DIR)/* 1>/dev/null) \
125+
$(shell adb shell rm $(CFG_ADB_TEST_DIR)/*.so 1>/dev/null) \
126+
$(shell adb shell rm $(CFG_ADB_TEST_DIR)/*-arm-linux-androideabi 1>/dev/null) \
127+
$(shell adb shell rm $(CFG_ADB_TEST_DIR)/*-arm-linux-androideabi.* 1>/dev/null) \
126128
$(shell adb push $(S)src/etc/adb_run_wrapper.sh $(CFG_ADB_TEST_DIR) 1>/dev/null) \
127129
$(shell adb push $(CFG_ANDROID_CROSS_PATH)/arm-linux-androideabi/lib/armv7-a/libgnustl_shared.so \
128130
$(CFG_ADB_TEST_DIR) 1>/dev/null) \

‎branches/snap-stage3/src/etc/adb_run_wrapper.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,16 @@ then
1717

1818
L_RET=1
1919
L_COUNT=0
20-
cd $PATH
2120
while [ $L_RET -eq 1 ]
2221
do
23-
TEST_EXEC_ENV=22 LD_LIBRARY_PATH=$PATH $PATH/$RUN $@ 1>$PATH/$RUN.stdout 2>$PATH/$RUN.stderr
22+
LD_LIBRARY_PATH=$PATH $PATH/$RUN $@ 1>$PATH/$RUN.stdout 2>$PATH/$RUN.stderr
2423
L_RET=$?
2524
if [ $L_COUNT -gt 0 ]
2625
then
2726
/system/bin/sleep $WAIT
2827
/system/bin/sync
2928
fi
30-
L_COUNT=$((L_COUNT+1))
29+
L_COUNT=`expr $L_COUNT+1`
3130
done
3231

3332
echo $L_RET > $PATH/$RUN.exitcode

‎branches/snap-stage3/src/librustc/middle/resolve.rs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1415,26 +1415,24 @@ impl Resolver {
14151415
(ReducedGraphParent,
14161416
vt<ReducedGraphParent>)) {
14171417
let ident = variant.node.name;
1418-
1419-
let privacy =
1420-
match variant.node.vis {
1421-
public => Public,
1422-
private => Private,
1423-
inherited => parent_privacy
1424-
};
1418+
let (child, _) = self.add_child(ident, parent, ForbidDuplicateValues,
1419+
variant.span);
1420+
1421+
let privacy;
1422+
match variant.node.vis {
1423+
public => privacy = Public,
1424+
private => privacy = Private,
1425+
inherited => privacy = parent_privacy
1426+
}
14251427

14261428
match variant.node.kind {
14271429
tuple_variant_kind(_) => {
1428-
let (child, _) = self.add_child(ident, parent, ForbidDuplicateValues,
1429-
variant.span);
14301430
child.define_value(privacy,
14311431
def_variant(item_id,
14321432
local_def(variant.node.id)),
14331433
variant.span);
14341434
}
14351435
struct_variant_kind(_) => {
1436-
let (child, _) = self.add_child(ident, parent, ForbidDuplicateTypesAndValues,
1437-
variant.span);
14381436
child.define_type(privacy,
14391437
def_variant(item_id,
14401438
local_def(variant.node.id)),

‎branches/snap-stage3/src/libstd/comm.rs

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -220,48 +220,58 @@ impl<T: Owned> Peekable<T> for PortSet<T> {
220220

221221
/// A channel that can be shared between many senders.
222222
pub struct SharedChan<T> {
223-
ch: Exclusive<pipesy::Chan<T>>
223+
inner: Either<Exclusive<pipesy::Chan<T>>, rtcomm::SharedChan<T>>
224224
}
225225

226226
impl<T: Owned> SharedChan<T> {
227227
/// Converts a `chan` into a `shared_chan`.
228228
pub fn new(c: Chan<T>) -> SharedChan<T> {
229229
let Chan { inner } = c;
230230
let c = match inner {
231-
Left(c) => c,
232-
Right(_) => fail!("SharedChan not implemented")
231+
Left(c) => Left(exclusive(c)),
232+
Right(c) => Right(rtcomm::SharedChan::new(c))
233233
};
234-
SharedChan { ch: exclusive(c) }
234+
SharedChan { inner: c }
235235
}
236236
}
237237

238238
impl<T: Owned> GenericChan<T> for SharedChan<T> {
239239
fn send(&self, x: T) {
240-
unsafe {
241-
let mut xx = Some(x);
242-
do self.ch.with_imm |chan| {
243-
let x = replace(&mut xx, None);
244-
chan.send(x.unwrap())
240+
match self.inner {
241+
Left(ref chan) => {
242+
unsafe {
243+
let mut xx = Some(x);
244+
do chan.with_imm |chan| {
245+
let x = replace(&mut xx, None);
246+
chan.send(x.unwrap())
247+
}
248+
}
245249
}
250+
Right(ref chan) => chan.send(x)
246251
}
247252
}
248253
}
249254

250255
impl<T: Owned> GenericSmartChan<T> for SharedChan<T> {
251256
fn try_send(&self, x: T) -> bool {
252-
unsafe {
253-
let mut xx = Some(x);
254-
do self.ch.with_imm |chan| {
255-
let x = replace(&mut xx, None);
256-
chan.try_send(x.unwrap())
257+
match self.inner {
258+
Left(ref chan) => {
259+
unsafe {
260+
let mut xx = Some(x);
261+
do chan.with_imm |chan| {
262+
let x = replace(&mut xx, None);
263+
chan.try_send(x.unwrap())
264+
}
265+
}
257266
}
267+
Right(ref chan) => chan.try_send(x)
258268
}
259269
}
260270
}
261271

262272
impl<T: Owned> ::clone::Clone for SharedChan<T> {
263273
fn clone(&self) -> SharedChan<T> {
264-
SharedChan { ch: self.ch.clone() }
274+
SharedChan { inner: self.inner.clone() }
265275
}
266276
}
267277

‎branches/snap-stage3/src/libstd/libc.rs

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,6 @@ pub mod types {
257257
pub type intptr_t = int;
258258
pub type uintptr_t = uint;
259259
}
260-
#[cfg(target_arch = "x86")]
261-
#[cfg(target_arch = "mips")]
262260
pub mod posix88 {
263261
pub type off_t = i32;
264262
pub type dev_t = u64;
@@ -270,20 +268,6 @@ pub mod types {
270268
pub type mode_t = u32;
271269
pub type ssize_t = i32;
272270
}
273-
#[cfg(target_arch = "arm")]
274-
pub mod posix88 {
275-
pub type off_t = i32;
276-
pub type dev_t = u32;
277-
pub type ino_t = u32;
278-
pub type pid_t = i32;
279-
pub type uid_t = u32;
280-
pub type gid_t = u32;
281-
pub type useconds_t = u32;
282-
pub type mode_t = u16;
283-
pub type ssize_t = i32;
284-
}
285-
#[cfg(target_arch = "x86")]
286-
#[cfg(target_arch = "mips")]
287271
pub mod posix01 {
288272
use libc::types::os::arch::c95::{c_short, c_long, c_ulong, time_t};
289273
use libc::types::os::arch::posix88::{dev_t, gid_t, ino_t};
@@ -295,6 +279,7 @@ pub mod types {
295279
pub type blkcnt_t = i32;
296280

297281
#[cfg(target_arch = "x86")]
282+
#[cfg(target_arch = "arm")]
298283
pub struct stat {
299284
st_dev: dev_t,
300285
__pad1: c_short,
@@ -342,39 +327,6 @@ pub mod types {
342327
st_pad5: [c_long, ..14],
343328
}
344329
}
345-
#[cfg(target_arch = "arm")]
346-
pub mod posix01 {
347-
use libc::types::os::arch::c95::{c_uchar, c_uint, c_ulong, time_t};
348-
use libc::types::os::arch::c99::{c_longlong, c_ulonglong};
349-
use libc::types::os::arch::posix88::{uid_t, gid_t, ino_t};
350-
use libc::types::os::arch::posix88::{uid_t};
351-
352-
pub type nlink_t = u16;
353-
pub type blksize_t = u32;
354-
pub type blkcnt_t = u32;
355-
356-
pub struct stat {
357-
st_dev: c_ulonglong,
358-
__pad0: [c_uchar, ..4],
359-
__st_ino: ino_t,
360-
st_mode: c_uint,
361-
st_nlink: c_uint,
362-
st_uid: uid_t,
363-
st_gid: gid_t,
364-
st_rdev: c_ulonglong,
365-
__pad3: [c_uchar, ..4],
366-
st_size: c_longlong,
367-
st_blksize: blksize_t,
368-
st_blocks: c_ulonglong,
369-
st_atime: time_t,
370-
st_atime_nsec: c_ulong,
371-
st_mtime: time_t,
372-
st_mtime_nsec: c_ulong,
373-
st_ctime: time_t,
374-
st_ctime_nsec: c_ulong,
375-
st_ino: c_ulonglong
376-
}
377-
}
378330
pub mod posix08 {}
379331
pub mod bsd44 {}
380332
pub mod extra {}

‎branches/snap-stage3/src/libstd/macros.rs

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,16 @@
1010

1111
#[macro_escape];
1212

13+
macro_rules! rterrln (
14+
($( $arg:expr),+) => ( {
15+
::rt::util::dumb_println(fmt!( $($arg),+ ));
16+
} )
17+
)
18+
1319
// Some basic logging
1420
macro_rules! rtdebug_ (
1521
($( $arg:expr),+) => ( {
16-
dumb_println(fmt!( $($arg),+ ));
17-
18-
fn dumb_println(s: &str) {
19-
use io::WriterUtil;
20-
let dbg = ::libc::STDERR_FILENO as ::io::fd_t;
21-
dbg.write_str(s);
22-
dbg.write_str("\n");
23-
}
24-
22+
rterrln!( $($arg),+ )
2523
} )
2624
)
2725

@@ -33,21 +31,15 @@ macro_rules! rtdebug (
3331
macro_rules! rtassert (
3432
( $arg:expr ) => ( {
3533
if !$arg {
36-
abort!("assertion failed: %s", stringify!($arg));
34+
rtabort!("assertion failed: %s", stringify!($arg));
3735
}
3836
} )
3937
)
4038

41-
macro_rules! abort(
42-
($( $msg:expr),+) => ( {
43-
rtdebug!($($msg),+);
44-
45-
do_abort();
4639

47-
// NB: This is in a fn to avoid putting the `unsafe` block in a macro,
48-
// which causes spurious 'unnecessary unsafe block' warnings.
49-
fn do_abort() -> ! {
50-
unsafe { ::libc::abort(); }
51-
}
40+
macro_rules! rtabort(
41+
($( $msg:expr),+) => ( {
42+
::rt::util::abort(fmt!($($msg),+));
5243
} )
5344
)
45+

‎branches/snap-stage3/src/libstd/path.rs

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ pub trait GenericPath {
128128
#[cfg(target_os = "android")]
129129
mod stat {
130130
#[cfg(target_arch = "x86")]
131+
#[cfg(target_arch = "arm")]
131132
pub mod arch {
132133
use libc;
133134

@@ -157,35 +158,6 @@ mod stat {
157158
}
158159
}
159160

160-
#[cfg(target_arch = "arm")]
161-
pub mod arch {
162-
use libc;
163-
164-
pub fn default_stat() -> libc::stat {
165-
libc::stat {
166-
st_dev: 0,
167-
__pad0: [0, ..4],
168-
__st_ino: 0,
169-
st_mode: 0,
170-
st_nlink: 0,
171-
st_uid: 0,
172-
st_gid: 0,
173-
st_rdev: 0,
174-
__pad3: [0, ..4],
175-
st_size: 0,
176-
st_blksize: 0,
177-
st_blocks: 0,
178-
st_atime: 0,
179-
st_atime_nsec: 0,
180-
st_mtime: 0,
181-
st_mtime_nsec: 0,
182-
st_ctime: 0,
183-
st_ctime_nsec: 0,
184-
st_ino: 0
185-
}
186-
}
187-
}
188-
189161
#[cfg(target_arch = "mips")]
190162
pub mod arch {
191163
use libc;

0 commit comments

Comments
 (0)