Skip to content

Commit e4edff5

Browse files
thestingerthestinger
committed
---
yaml --- r: 59871 b: refs/heads/master c: d6697e7 h: refs/heads/master i: 59869: 53056c6 59867: beee8c8 59863: dae6816 59855: e7fee35 59839: b9abc2b v: v3
1 parent 833e05e commit e4edff5

File tree

9 files changed

+15
-896
lines changed

9 files changed

+15
-896
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: 8a28970ed36a9259b6cab2ad464f358c2d0bbb6f
2+
refs/heads/master: d6697e702774c422871499826e7d346320610242
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
55
refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589

‎trunk/mk/rt.mk

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,14 +163,16 @@ endif
163163
ifdef CFG_WINDOWSY_$(1)
164164
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
165165
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
166+
CFLAGS="$$(CFG_GCCISH_CFLAGS)" \
167+
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS)" \
166168
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/libuv" \
167169
OS=mingw \
168170
V=$$(VERBOSE)
169171
else ifeq ($(OSTYPE_$(1)), linux-androideabi)
170172
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
171173
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
172-
CFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
173-
LDFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1)))" \
174+
CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
175+
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1)))" \
174176
CC="$$(CC_$(1))" \
175177
CXX="$$(CXX_$(1))" \
176178
AR="$$(AR_$(1))" \
@@ -181,8 +183,8 @@ $$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
181183
else
182184
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
183185
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
184-
CFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
185-
LDFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1)))" \
186+
CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
187+
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1)))" \
186188
CC="$$(CC_$(1))" \
187189
CXX="$$(CXX_$(1))" \
188190
AR="$$(AR_$(1))" \

‎trunk/src/etc/ziggurat_tables.py

Lines changed: 0 additions & 121 deletions
This file was deleted.

‎trunk/src/libcore/iterator.rs

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pub trait Iterator<A> {
2929
///
3030
/// In the future these will be default methods instead of a utility trait.
3131
pub trait IteratorUtil<A> {
32-
fn chain<U: Iterator<A>>(self, other: U) -> ChainIterator<Self, U>;
32+
fn chain(self, other: Self) -> ChainIterator<Self>;
3333
fn zip<B, U: Iterator<B>>(self, other: U) -> ZipIterator<Self, U>;
3434
// FIXME: #5898: should be called map
3535
fn transform<'r, B>(self, f: &'r fn(A) -> B) -> MapIterator<'r, A, B, Self>;
@@ -50,7 +50,7 @@ pub trait IteratorUtil<A> {
5050
/// In the future these will be default methods instead of a utility trait.
5151
impl<A, T: Iterator<A>> IteratorUtil<A> for T {
5252
#[inline(always)]
53-
fn chain<U: Iterator<A>>(self, other: U) -> ChainIterator<T, U> {
53+
fn chain(self, other: T) -> ChainIterator<T> {
5454
ChainIterator{a: self, b: other, flag: false}
5555
}
5656

@@ -115,13 +115,13 @@ impl<A, T: Iterator<A>> IteratorUtil<A> for T {
115115
}
116116
}
117117

118-
pub struct ChainIterator<T, U> {
118+
pub struct ChainIterator<T> {
119119
priv a: T,
120-
priv b: U,
120+
priv b: T,
121121
priv flag: bool
122122
}
123123

124-
impl<A, T: Iterator<A>, U: Iterator<A>> Iterator<A> for ChainIterator<T, U> {
124+
impl<A, T: Iterator<A>> Iterator<A> for ChainIterator<T> {
125125
#[inline]
126126
fn next(&mut self) -> Option<A> {
127127
if self.flag {
@@ -385,7 +385,7 @@ mod tests {
385385
#[test]
386386
fn test_iterator_chain() {
387387
let xs = [0u, 1, 2, 3, 4, 5];
388-
let ys = [30u, 40, 50, 60];
388+
let ys = [30, 40, 50, 60];
389389
let expected = [0, 1, 2, 3, 4, 5, 30, 40, 50, 60];
390390
let mut it = xs.iter().chain(ys.iter());
391391
let mut i = 0;
@@ -394,15 +394,6 @@ mod tests {
394394
i += 1;
395395
}
396396
assert_eq!(i, expected.len());
397-
398-
let ys = Counter::new(30u, 10).take(4);
399-
let mut it = xs.iter().transform(|&x| x).chain(ys);
400-
let mut i = 0;
401-
for it.advance |x: uint| {
402-
assert_eq!(x, expected[i]);
403-
i += 1;
404-
}
405-
assert_eq!(i, expected.len());
406397
}
407398

408399
#[test]

‎trunk/src/libcore/libc.rs

Lines changed: 2 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ pub use libc::funcs::posix88::unistd::*;
104104

105105
pub use libc::funcs::posix01::stat_::*;
106106
pub use libc::funcs::posix01::unistd::*;
107-
pub use libc::funcs::posix01::glob::*;
108107
pub use libc::funcs::posix08::unistd::*;
109108

110109
pub use libc::funcs::bsd44::*;
@@ -211,21 +210,7 @@ pub mod types {
211210
#[cfg(target_os = "android")]
212211
pub mod os {
213212
pub mod common {
214-
pub mod posix01 {
215-
use libc::types::common::c95::{c_void};
216-
use libc::types::os::arch::c95::{c_char, size_t};
217-
pub struct glob_t {
218-
gl_pathc: size_t,
219-
gl_pathv: **c_char,
220-
gl_offs: size_t,
221-
222-
__unused1: *c_void,
223-
__unused2: *c_void,
224-
__unused3: *c_void,
225-
__unused4: *c_void,
226-
__unused5: *c_void,
227-
}
228-
}
213+
pub mod posix01 {}
229214
}
230215

231216
#[cfg(target_arch = "x86")]
@@ -384,25 +369,7 @@ pub mod types {
384369
#[cfg(target_os = "freebsd")]
385370
pub mod os {
386371
pub mod common {
387-
pub mod posix01 {
388-
use libc::types::common::c95::{c_void};
389-
use libc::types::os::arch::c95::{c_char, c_int, size_t};
390-
pub struct glob_t {
391-
gl_pathc: size_t,
392-
__unused1: size_t,
393-
gl_offs: size_t,
394-
__unused2: c_int,
395-
gl_pathv: **c_char,
396-
397-
__unused3: *c_void,
398-
399-
__unused4: *c_void,
400-
__unused5: *c_void,
401-
__unused6: *c_void,
402-
__unused7: *c_void,
403-
__unused8: *c_void,
404-
}
405-
}
372+
pub mod posix01 {}
406373
}
407374

408375
#[cfg(target_arch = "x86_64")]
@@ -604,23 +571,6 @@ pub mod types {
604571
pub mod os {
605572
pub mod common {
606573
pub mod posix01 {
607-
use libc::types::common::c95::{c_void};
608-
use libc::types::os::arch::c95::{c_char, c_int, size_t};
609-
pub struct glob_t {
610-
gl_pathc: size_t,
611-
__unused1: c_int,
612-
gl_offs: size_t,
613-
__unused2: c_int,
614-
gl_pathv: **c_char,
615-
616-
__unused3: *c_void,
617-
618-
__unused4: *c_void,
619-
__unused5: *c_void,
620-
__unused6: *c_void,
621-
__unused7: *c_void,
622-
__unused8: *c_void,
623-
}
624574
}
625575
}
626576

@@ -927,18 +877,6 @@ pub mod consts {
927877
}
928878
pub mod posix01 {
929879
pub static SIGTRAP : int = 5;
930-
931-
pub static GLOB_ERR : int = 1 << 0;
932-
pub static GLOB_MARK : int = 1 << 1;
933-
pub static GLOB_NOSORT : int = 1 << 2;
934-
pub static GLOB_DOOFFS : int = 1 << 3;
935-
pub static GLOB_NOCHECK : int = 1 << 4;
936-
pub static GLOB_APPEND : int = 1 << 5;
937-
pub static GLOB_NOESCAPE : int = 1 << 6;
938-
939-
pub static GLOB_NOSPACE : int = 1;
940-
pub static GLOB_ABORTED : int = 2;
941-
pub static GLOB_NOMATCH : int = 3;
942880
}
943881
pub mod posix08 {
944882
}
@@ -1018,18 +956,6 @@ pub mod consts {
1018956
}
1019957
pub mod posix01 {
1020958
pub static SIGTRAP : int = 5;
1021-
1022-
pub static GLOB_APPEND : int = 0x0001;
1023-
pub static GLOB_DOOFFS : int = 0x0002;
1024-
pub static GLOB_ERR : int = 0x0004;
1025-
pub static GLOB_MARK : int = 0x0008;
1026-
pub static GLOB_NOCHECK : int = 0x0010;
1027-
pub static GLOB_NOSORT : int = 0x0020;
1028-
pub static GLOB_NOESCAPE : int = 0x2000;
1029-
1030-
pub static GLOB_NOSPACE : int = -1;
1031-
pub static GLOB_ABORTED : int = -2;
1032-
pub static GLOB_NOMATCH : int = -3;
1033959
}
1034960
pub mod posix08 {
1035961
}
@@ -1110,18 +1036,6 @@ pub mod consts {
11101036
}
11111037
pub mod posix01 {
11121038
pub static SIGTRAP : int = 5;
1113-
1114-
pub static GLOB_APPEND : int = 0x0001;
1115-
pub static GLOB_DOOFFS : int = 0x0002;
1116-
pub static GLOB_ERR : int = 0x0004;
1117-
pub static GLOB_MARK : int = 0x0008;
1118-
pub static GLOB_NOCHECK : int = 0x0010;
1119-
pub static GLOB_NOSORT : int = 0x0020;
1120-
pub static GLOB_NOESCAPE : int = 0x2000;
1121-
1122-
pub static GLOB_NOSPACE : int = -1;
1123-
pub static GLOB_ABORTED : int = -2;
1124-
pub static GLOB_NOMATCH : int = -3;
11251039
}
11261040
pub mod posix08 {
11271041
}
@@ -1692,21 +1606,6 @@ pub mod funcs {
16921606
-> pid_t;
16931607
}
16941608
}
1695-
1696-
#[nolink]
1697-
#[abi = "cdecl"]
1698-
pub mod glob {
1699-
use libc::types::common::c95::{c_void};
1700-
use libc::types::os::arch::c95::{c_char, c_int};
1701-
use libc::types::os::common::posix01::{glob_t};
1702-
1703-
pub extern {
1704-
unsafe fn glob(pattern: *c_char, flags: c_int,
1705-
errfunc: *c_void, // XXX callback
1706-
pglob: *mut glob_t);
1707-
unsafe fn globfree(pglob: *mut glob_t);
1708-
}
1709-
}
17101609
}
17111610

17121611
#[cfg(target_os = "win32")]
@@ -1716,9 +1615,6 @@ pub mod funcs {
17161615

17171616
pub mod unistd {
17181617
}
1719-
1720-
pub mod glob {
1721-
}
17221618
}
17231619

17241620

0 commit comments

Comments
 (0)