Skip to content

Commit 97376fb

Browse files
toffalettitoffaletti
committed
---
yaml --- r: 95050 b: refs/heads/dist-snap c: b617569 h: refs/heads/master v: v3
1 parent 01afc6c commit 97376fb

File tree

5 files changed

+63
-60
lines changed

5 files changed

+63
-60
lines changed

‎[refs]

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

‎branches/dist-snap/src/librustc/metadata/encoder.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1574,7 +1574,7 @@ fn encode_crate_deps(ecx: &EncodeContext,
15741574
fn encode_lang_items(ecx: &EncodeContext, ebml_w: &mut writer::Encoder) {
15751575
ebml_w.start_tag(tag_lang_items);
15761576

1577-
for (i, def_id) in ecx.tcx.lang_items.items() {
1577+
do ecx.tcx.lang_items.each_item |def_id, i| {
15781578
for id in def_id.iter() {
15791579
if id.crate == LOCAL_CRATE {
15801580
ebml_w.start_tag(tag_lang_items_item);
@@ -1590,7 +1590,8 @@ fn encode_lang_items(ecx: &EncodeContext, ebml_w: &mut writer::Encoder) {
15901590
ebml_w.end_tag(); // tag_lang_items_item
15911591
}
15921592
}
1593-
}
1593+
true
1594+
};
15941595

15951596
ebml_w.end_tag(); // tag_lang_items
15961597
}

‎branches/dist-snap/src/librustc/middle/lang_items.rs

Lines changed: 48 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ use syntax::visit;
3232
use syntax::visit::Visitor;
3333

3434
use std::hashmap::HashMap;
35-
use std::iter::Enumerate;
36-
use std::vec;
3735

3836
pub enum LangItem {
3937
FreezeTraitLangItem, // 0
@@ -94,8 +92,8 @@ impl LanguageItems {
9492
}
9593
}
9694

97-
pub fn items<'a>(&'a self) -> Enumerate<vec::VecIterator<'a, Option<DefId>>> {
98-
self.items.iter().enumerate()
95+
pub fn each_item(&self, f: &fn(Option<DefId>, uint) -> bool) -> bool {
96+
self.items.iter().enumerate().advance(|(i, &item)| f(item, i))
9997
}
10098

10199
pub fn item_name(index: uint) -> &'static str {
@@ -300,7 +298,7 @@ struct LanguageItemCollector<'self> {
300298
crate: &'self Crate,
301299
session: Session,
302300

303-
item_refs: HashMap<&'static str, uint>,
301+
item_refs: HashMap<@str, uint>,
304302
}
305303

306304
struct LanguageItemVisitor<'self> {
@@ -329,51 +327,51 @@ impl<'self> LanguageItemCollector<'self> {
329327
-> LanguageItemCollector<'a> {
330328
let mut item_refs = HashMap::new();
331329

332-
item_refs.insert("freeze", FreezeTraitLangItem as uint);
333-
item_refs.insert("send", SendTraitLangItem as uint);
334-
item_refs.insert("sized", SizedTraitLangItem as uint);
335-
336-
item_refs.insert("drop", DropTraitLangItem as uint);
337-
338-
item_refs.insert("add", AddTraitLangItem as uint);
339-
item_refs.insert("sub", SubTraitLangItem as uint);
340-
item_refs.insert("mul", MulTraitLangItem as uint);
341-
item_refs.insert("div", DivTraitLangItem as uint);
342-
item_refs.insert("rem", RemTraitLangItem as uint);
343-
item_refs.insert("neg", NegTraitLangItem as uint);
344-
item_refs.insert("not", NotTraitLangItem as uint);
345-
item_refs.insert("bitxor", BitXorTraitLangItem as uint);
346-
item_refs.insert("bitand", BitAndTraitLangItem as uint);
347-
item_refs.insert("bitor", BitOrTraitLangItem as uint);
348-
item_refs.insert("shl", ShlTraitLangItem as uint);
349-
item_refs.insert("shr", ShrTraitLangItem as uint);
350-
item_refs.insert("index", IndexTraitLangItem as uint);
351-
352-
item_refs.insert("eq", EqTraitLangItem as uint);
353-
item_refs.insert("ord", OrdTraitLangItem as uint);
354-
355-
item_refs.insert("str_eq", StrEqFnLangItem as uint);
356-
item_refs.insert("uniq_str_eq", UniqStrEqFnLangItem as uint);
357-
item_refs.insert("fail_", FailFnLangItem as uint);
358-
item_refs.insert("fail_bounds_check",
330+
item_refs.insert(@"freeze", FreezeTraitLangItem as uint);
331+
item_refs.insert(@"send", SendTraitLangItem as uint);
332+
item_refs.insert(@"sized", SizedTraitLangItem as uint);
333+
334+
item_refs.insert(@"drop", DropTraitLangItem as uint);
335+
336+
item_refs.insert(@"add", AddTraitLangItem as uint);
337+
item_refs.insert(@"sub", SubTraitLangItem as uint);
338+
item_refs.insert(@"mul", MulTraitLangItem as uint);
339+
item_refs.insert(@"div", DivTraitLangItem as uint);
340+
item_refs.insert(@"rem", RemTraitLangItem as uint);
341+
item_refs.insert(@"neg", NegTraitLangItem as uint);
342+
item_refs.insert(@"not", NotTraitLangItem as uint);
343+
item_refs.insert(@"bitxor", BitXorTraitLangItem as uint);
344+
item_refs.insert(@"bitand", BitAndTraitLangItem as uint);
345+
item_refs.insert(@"bitor", BitOrTraitLangItem as uint);
346+
item_refs.insert(@"shl", ShlTraitLangItem as uint);
347+
item_refs.insert(@"shr", ShrTraitLangItem as uint);
348+
item_refs.insert(@"index", IndexTraitLangItem as uint);
349+
350+
item_refs.insert(@"eq", EqTraitLangItem as uint);
351+
item_refs.insert(@"ord", OrdTraitLangItem as uint);
352+
353+
item_refs.insert(@"str_eq", StrEqFnLangItem as uint);
354+
item_refs.insert(@"uniq_str_eq", UniqStrEqFnLangItem as uint);
355+
item_refs.insert(@"fail_", FailFnLangItem as uint);
356+
item_refs.insert(@"fail_bounds_check",
359357
FailBoundsCheckFnLangItem as uint);
360-
item_refs.insert("exchange_malloc", ExchangeMallocFnLangItem as uint);
361-
item_refs.insert("closure_exchange_malloc", ClosureExchangeMallocFnLangItem as uint);
362-
item_refs.insert("exchange_free", ExchangeFreeFnLangItem as uint);
363-
item_refs.insert("malloc", MallocFnLangItem as uint);
364-
item_refs.insert("free", FreeFnLangItem as uint);
365-
item_refs.insert("borrow_as_imm", BorrowAsImmFnLangItem as uint);
366-
item_refs.insert("borrow_as_mut", BorrowAsMutFnLangItem as uint);
367-
item_refs.insert("return_to_mut", ReturnToMutFnLangItem as uint);
368-
item_refs.insert("check_not_borrowed",
358+
item_refs.insert(@"exchange_malloc", ExchangeMallocFnLangItem as uint);
359+
item_refs.insert(@"closure_exchange_malloc", ClosureExchangeMallocFnLangItem as uint);
360+
item_refs.insert(@"exchange_free", ExchangeFreeFnLangItem as uint);
361+
item_refs.insert(@"malloc", MallocFnLangItem as uint);
362+
item_refs.insert(@"free", FreeFnLangItem as uint);
363+
item_refs.insert(@"borrow_as_imm", BorrowAsImmFnLangItem as uint);
364+
item_refs.insert(@"borrow_as_mut", BorrowAsMutFnLangItem as uint);
365+
item_refs.insert(@"return_to_mut", ReturnToMutFnLangItem as uint);
366+
item_refs.insert(@"check_not_borrowed",
369367
CheckNotBorrowedFnLangItem as uint);
370-
item_refs.insert("strdup_uniq", StrDupUniqFnLangItem as uint);
371-
item_refs.insert("record_borrow", RecordBorrowFnLangItem as uint);
372-
item_refs.insert("unrecord_borrow", UnrecordBorrowFnLangItem as uint);
373-
item_refs.insert("start", StartFnLangItem as uint);
374-
item_refs.insert("ty_desc", TyDescStructLangItem as uint);
375-
item_refs.insert("ty_visitor", TyVisitorTraitLangItem as uint);
376-
item_refs.insert("opaque", OpaqueStructLangItem as uint);
368+
item_refs.insert(@"strdup_uniq", StrDupUniqFnLangItem as uint);
369+
item_refs.insert(@"record_borrow", RecordBorrowFnLangItem as uint);
370+
item_refs.insert(@"unrecord_borrow", UnrecordBorrowFnLangItem as uint);
371+
item_refs.insert(@"start", StartFnLangItem as uint);
372+
item_refs.insert(@"ty_desc", TyDescStructLangItem as uint);
373+
item_refs.insert(@"ty_visitor", TyVisitorTraitLangItem as uint);
374+
item_refs.insert(@"opaque", OpaqueStructLangItem as uint);
377375

378376
LanguageItemCollector {
379377
crate: crate,
@@ -418,8 +416,8 @@ impl<'self> LanguageItemCollector<'self> {
418416
return; // Didn't match.
419417
}
420418

421-
let item_index = self.item_refs.find_equiv(&value).map_move(|x| *x);
422-
// prevent borrow checker from considering ^~~~~~~~~~~
419+
let item_index = self.item_refs.find(&value).map_move(|x| *x);
420+
// prevent borrow checker from considering ^~~~~~~~~~~
423421
// self to be borrowed (annoying)
424422

425423
match item_index {

‎branches/dist-snap/src/libstd/os.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1398,7 +1398,7 @@ impl to_str::ToStr for MapError {
13981398

13991399
#[cfg(unix)]
14001400
impl MemoryMap {
1401-
pub fn new(min_len: uint, options: ~[MapOption]) -> Result<~MemoryMap, MapError> {
1401+
pub fn new(min_len: uint, options: &[MapOption]) -> Result<MemoryMap, MapError> {
14021402
#[fixed_stack_segment]; #[inline(never)];
14031403

14041404
use libc::off_t;
@@ -1441,7 +1441,7 @@ impl MemoryMap {
14411441
code => ErrUnknown(code)
14421442
})
14431443
} else {
1444-
Ok(~MemoryMap {
1444+
Ok(MemoryMap {
14451445
data: r as *mut u8,
14461446
len: len,
14471447
kind: if fd == -1 {
@@ -1478,7 +1478,7 @@ impl Drop for MemoryMap {
14781478
14791479
#[cfg(windows)]
14801480
impl MemoryMap {
1481-
pub fn new(min_len: uint, options: ~[MapOption]) -> Result<~MemoryMap, MapError> {
1481+
pub fn new(min_len: uint, options: &[MapOption]) -> Result<MemoryMap, MapError> {
14821482
#[fixed_stack_segment]; #[inline(never)];
14831483
14841484
use libc::types::os::arch::extra::{LPVOID, DWORD, SIZE_T, HANDLE};
@@ -1524,7 +1524,7 @@ impl MemoryMap {
15241524
};
15251525
match r as uint {
15261526
0 => Err(ErrVirtualAlloc(errno())),
1527-
_ => Ok(~MemoryMap {
1527+
_ => Ok(MemoryMap {
15281528
data: r as *mut u8,
15291529
len: len,
15301530
kind: MapVirtual
@@ -1560,7 +1560,7 @@ impl MemoryMap {
15601560
0);
15611561
match r as uint {
15621562
0 => Err(ErrMapViewOfFile(errno())),
1563-
_ => Ok(~MemoryMap {
1563+
_ => Ok(MemoryMap {
15641564
data: r as *mut u8,
15651565
len: len,
15661566
kind: MapFile(mapping as *c_void)
@@ -1996,7 +1996,7 @@ mod tests {
19961996
fn memory_map_rw() {
19971997
use result::{Ok, Err};
19981998
1999-
let chunk = match os::MemoryMap::new(16, ~[
1999+
let chunk = match os::MemoryMap::new(16, [
20002000
os::MapReadable,
20012001
os::MapWritable
20022002
]) {
@@ -2050,7 +2050,7 @@ mod tests {
20502050
}
20512051
fd
20522052
};
2053-
let chunk = match MemoryMap::new(size / 2, ~[
2053+
let chunk = match MemoryMap::new(size / 2, [
20542054
MapReadable,
20552055
MapWritable,
20562056
MapFd(fd),

‎branches/dist-snap/src/libstd/rt/uv/net.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,7 @@ mod test {
624624
}
625625
626626
#[test]
627+
#[ignore(cfg(windows))] // FIXME #8815
627628
fn listen_ip4() {
628629
do run_in_bare_thread() {
629630
static MAX: int = 10;
@@ -698,6 +699,7 @@ mod test {
698699
}
699700
700701
#[test]
702+
#[ignore(cfg(windows))] // FIXME #8815
701703
fn listen_ip6() {
702704
do run_in_bare_thread() {
703705
static MAX: int = 10;
@@ -774,6 +776,7 @@ mod test {
774776
}
775777
776778
#[test]
779+
#[ignore(cfg(windows))] // FIXME #8815
777780
fn udp_recv_ip4() {
778781
do run_in_bare_thread() {
779782
static MAX: int = 10;
@@ -834,6 +837,7 @@ mod test {
834837
}
835838
836839
#[test]
840+
#[ignore(cfg(windows))] // FIXME #8815
837841
fn udp_recv_ip6() {
838842
do run_in_bare_thread() {
839843
static MAX: int = 10;

0 commit comments

Comments
 (0)