Skip to content

Commit be52b46

Browse files
frewsxcvfrewsxcv
committed
---
yaml --- r: 160691 b: refs/heads/master c: ce238d7 h: refs/heads/master i: 160689: ade4e0d 160687: 90c626b v: v3
1 parent 96716cc commit be52b46

Some content is hidden

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

79 files changed

+286
-707
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: fac5a07679cac21a580badc84b755b8df0f975cf
2+
refs/heads/master: ce238d752b1e04d4aea21c0fadf420a270ed6ff9
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: c9f6d696420107f82304b992cf623b806995fe18
55
refs/heads/try: 225de0d60f8ca8dcc62ab2fd8818ebbda4b58cfe

‎trunk/Makefile.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,6 @@ include $(CFG_SRC_DIR)mk/rustllvm.mk
198198
include $(CFG_SRC_DIR)mk/docs.mk
199199
# LLVM
200200
include $(CFG_SRC_DIR)mk/llvm.mk
201-
# Rules for installing debugger scripts
202-
include $(CFG_SRC_DIR)mk/debuggers.mk
203201

204202
######################################################################
205203
# Secondary makefiles, conditionalized for speed

‎trunk/mk/clean.mk

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ clean-generic-$(2)-$(1):
6363
-name '*.lib' -o \
6464
-name '*.dll' -o \
6565
-name '*.def' -o \
66-
-name '*.py' -o \
6766
-name '*.bc' \
6867
\) \
6968
| xargs rm -f
@@ -79,7 +78,7 @@ define CLEAN_HOST_STAGE_N
7978

8079
clean$(1)_H_$(2): \
8180
$$(foreach crate,$$(CRATES),clean$(1)_H_$(2)-lib-$$(crate)) \
82-
$$(foreach tool,$$(TOOLS) $$(DEBUGGER_BIN_SCRIPTS),clean$(1)_H_$(2)-tool-$$(tool))
81+
$$(foreach tool,$$(TOOLS),clean$(1)_H_$(2)-tool-$$(tool))
8382
$$(Q)rm -fr $(2)/rt/libbacktrace
8483

8584
clean$(1)_H_$(2)-tool-%:
@@ -99,7 +98,7 @@ define CLEAN_TARGET_STAGE_N
9998

10099
clean$(1)_T_$(2)_H_$(3): \
101100
$$(foreach crate,$$(CRATES),clean$(1)_T_$(2)_H_$(3)-lib-$$(crate)) \
102-
$$(foreach tool,$$(TOOLS) $$(DEBUGGER_BIN_SCRIPTS),clean$(1)_T_$(2)_H_$(3)-tool-$$(tool))
101+
$$(foreach tool,$$(TOOLS),clean$(1)_T_$(2)_H_$(3)-tool-$$(tool))
103102
$$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
104103
$$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libcompiler-rt.a
105104
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/librun_pass_stage* # For unix

‎trunk/mk/debuggers.mk

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

‎trunk/mk/main.mk

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,7 @@ HSREQ$(1)_H_$(3) = $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3))
356356
else
357357
HSREQ$(1)_H_$(3) = \
358358
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
359-
$$(MKFILE_DEPS) \
360-
tmp/install-debugger-scripts$(1)_H_$(3).done
359+
$$(MKFILE_DEPS)
361360
endif
362361

363362
# Prerequisites for using the stageN compiler to build target artifacts
@@ -371,8 +370,7 @@ TSREQ$(1)_T_$(2)_H_$(3) = \
371370
SREQ$(1)_T_$(2)_H_$(3) = \
372371
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
373372
$$(foreach dep,$$(TARGET_CRATES), \
374-
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(dep)) \
375-
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3).done
373+
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(dep))
376374

377375
# Prerequisites for a working stageN compiler and complete set of target
378376
# libraries

‎trunk/mk/prepare.mk

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ prepare-base-$(1): PREPARE_DEST_LIB_DIR=$$(PREPARE_DEST_DIR)/$$(CFG_LIBDIR_RELAT
155155
prepare-base-$(1): PREPARE_DEST_MAN_DIR=$$(PREPARE_DEST_DIR)/share/man/man1
156156
prepare-base-$(1): prepare-everything-$(1)
157157

158-
prepare-everything-$(1): prepare-host-$(1) prepare-targets-$(1) prepare-debugger-scripts-$(1)
158+
prepare-everything-$(1): prepare-host-$(1) prepare-targets-$(1)
159159

160160
prepare-host-$(1): prepare-host-tools-$(1)
161161

@@ -167,13 +167,8 @@ prepare-host-tools-$(1): \
167167
prepare-host-dirs-$(1): prepare-maybe-clean-$(1)
168168
$$(call PREPARE_DIR,$$(PREPARE_DEST_BIN_DIR))
169169
$$(call PREPARE_DIR,$$(PREPARE_DEST_LIB_DIR))
170-
$$(call PREPARE_DIR,$$(PREPARE_DEST_LIB_DIR)/rustlib/etc)
171170
$$(call PREPARE_DIR,$$(PREPARE_DEST_MAN_DIR))
172171

173-
prepare-debugger-scripts-$(1): prepare-host-dirs-$(1) $(DEBUGGER_SCRIPTS_ALL)
174-
$$(Q)$$(PREPARE_BIN_CMD) $(DEBUGGER_BIN_SCRIPTS_ABS) $$(PREPARE_DEST_BIN_DIR)
175-
$$(Q)$$(PREPARE_LIB_CMD) $(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ABS) $$(PREPARE_DEST_LIB_DIR)/rustlib/etc
176-
177172
$$(foreach tool,$$(PREPARE_TOOLS), \
178173
$$(foreach host,$$(CFG_HOST), \
179174
$$(eval $$(call DEF_PREPARE_HOST_TOOL,$$(tool),$$(PREPARE_STAGE),$$(host),$(1)))))

‎trunk/src/etc/lldb_rust_formatters.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,8 @@ def print_struct_val_starting_from(field_start_index, val, internal_dict):
6969
assert val.GetType().GetTypeClass() == lldb.eTypeClassStruct
7070

7171
t = val.GetType()
72-
type_name = extract_type_name(t.GetName())
73-
num_children = val.num_children
74-
75-
if (num_children - field_start_index) == 0:
76-
# The only field of this struct is the enum discriminant
77-
return type_name
78-
7972
has_field_names = type_has_field_names(t)
73+
type_name = extract_type_name(t.GetName())
8074

8175
if has_field_names:
8276
template = "%(type_name)s {\n%(body)s\n}"
@@ -89,6 +83,8 @@ def print_struct_val_starting_from(field_start_index, val, internal_dict):
8983
# this is a tuple, so don't print the type name
9084
type_name = ""
9185

86+
num_children = val.num_children
87+
9288
def render_child(child_index):
9389
this = ""
9490
if has_field_names:
@@ -109,6 +105,7 @@ def print_enum_val(val, internal_dict):
109105

110106
assert val.GetType().GetTypeClass() == lldb.eTypeClassUnion
111107

108+
112109
if val.num_children == 1:
113110
# This is either an enum with just one variant, or it is an Option-like enum
114111
# where the discriminant is encoded in a non-nullable pointer field. We find

‎trunk/src/etc/rust-lldb

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

‎trunk/src/libcollections/binary_heap.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -585,10 +585,10 @@ impl<T> DoubleEndedIterator<T> for MoveItems<T> {
585585
fn next_back(&mut self) -> Option<T> { self.iter.next_back() }
586586
}
587587

588-
impl<T> ExactSizeIterator<T> for MoveItems<T> {}
588+
impl<T> ExactSize<T> for MoveItems<T> {}
589589

590590
impl<T: Ord> FromIterator<T> for BinaryHeap<T> {
591-
fn from_iter<Iter: Iterator<T>>(iter: Iter) -> BinaryHeap<T> {
591+
fn from_iter<Iter: Iterator<T>>(mut iter: Iter) -> BinaryHeap<T> {
592592
let vec: Vec<T> = iter.collect();
593593
BinaryHeap::from_vec(vec)
594594
}

‎trunk/src/libcollections/bit.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ use core::prelude::*;
6868
use core::cmp;
6969
use core::default::Default;
7070
use core::fmt;
71-
use core::iter::{Chain, Enumerate, Repeat, Skip, Take, repeat};
71+
use core::iter::{Chain, Enumerate, Repeat, Skip, Take};
7272
use core::iter;
7373
use core::num::Int;
7474
use core::slice;
@@ -88,11 +88,11 @@ fn match_words <'a,'b>(a: &'a Bitv, b: &'b Bitv) -> (MatchWords<'a>, MatchWords<
8888

8989
// have to uselessly pretend to pad the longer one for type matching
9090
if a_len < b_len {
91-
(a.mask_words(0).chain(repeat(0u32).enumerate().take(b_len).skip(a_len)),
92-
b.mask_words(0).chain(repeat(0u32).enumerate().take(0).skip(0)))
91+
(a.mask_words(0).chain(Repeat::new(0u32).enumerate().take(b_len).skip(a_len)),
92+
b.mask_words(0).chain(Repeat::new(0u32).enumerate().take(0).skip(0)))
9393
} else {
94-
(a.mask_words(0).chain(repeat(0u32).enumerate().take(0).skip(0)),
95-
b.mask_words(0).chain(repeat(0u32).enumerate().take(a_len).skip(b_len)))
94+
(a.mask_words(0).chain(Repeat::new(0u32).enumerate().take(0).skip(0)),
95+
b.mask_words(0).chain(Repeat::new(0u32).enumerate().take(a_len).skip(b_len)))
9696
}
9797
}
9898

@@ -943,7 +943,7 @@ impl<'a> DoubleEndedIterator<bool> for Bits<'a> {
943943
}
944944
}
945945

946-
impl<'a> ExactSizeIterator<bool> for Bits<'a> {}
946+
impl<'a> ExactSize<bool> for Bits<'a> {}
947947

948948
impl<'a> RandomAccessIterator<bool> for Bits<'a> {
949949
#[inline]

‎trunk/src/libcollections/btree/map.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,7 @@ impl<K, V, E, T: Traverse<E> + DoubleEndedIterator<TraversalItem<K, V, E>>>
863863
// Note that the design of these iterators permits an *arbitrary* initial pair of min and max,
864864
// making these arbitrary sub-range iterators. However the logic to construct these paths
865865
// efficiently is fairly involved, so this is a FIXME. The sub-range iterators also wouldn't be
866-
// able to accurately predict size, so those iterators can't implement ExactSizeIterator.
866+
// able to accurately predict size, so those iterators can't implement ExactSize.
867867
fn next(&mut self) -> Option<(K, V)> {
868868
loop {
869869
// We want the smallest element, so try to get the top of the left stack
@@ -963,7 +963,7 @@ impl<'a, K, V> Iterator<(&'a K, &'a V)> for Entries<'a, K, V> {
963963
impl<'a, K, V> DoubleEndedIterator<(&'a K, &'a V)> for Entries<'a, K, V> {
964964
fn next_back(&mut self) -> Option<(&'a K, &'a V)> { self.inner.next_back() }
965965
}
966-
impl<'a, K, V> ExactSizeIterator<(&'a K, &'a V)> for Entries<'a, K, V> {}
966+
impl<'a, K, V> ExactSize<(&'a K, &'a V)> for Entries<'a, K, V> {}
967967

968968

969969
impl<'a, K, V> Iterator<(&'a K, &'a mut V)> for MutEntries<'a, K, V> {
@@ -973,7 +973,7 @@ impl<'a, K, V> Iterator<(&'a K, &'a mut V)> for MutEntries<'a, K, V> {
973973
impl<'a, K, V> DoubleEndedIterator<(&'a K, &'a mut V)> for MutEntries<'a, K, V> {
974974
fn next_back(&mut self) -> Option<(&'a K, &'a mut V)> { self.inner.next_back() }
975975
}
976-
impl<'a, K, V> ExactSizeIterator<(&'a K, &'a mut V)> for MutEntries<'a, K, V> {}
976+
impl<'a, K, V> ExactSize<(&'a K, &'a mut V)> for MutEntries<'a, K, V> {}
977977

978978

979979
impl<K, V> Iterator<(K, V)> for MoveEntries<K, V> {
@@ -983,7 +983,7 @@ impl<K, V> Iterator<(K, V)> for MoveEntries<K, V> {
983983
impl<K, V> DoubleEndedIterator<(K, V)> for MoveEntries<K, V> {
984984
fn next_back(&mut self) -> Option<(K, V)> { self.inner.next_back() }
985985
}
986-
impl<K, V> ExactSizeIterator<(K, V)> for MoveEntries<K, V> {}
986+
impl<K, V> ExactSize<(K, V)> for MoveEntries<K, V> {}
987987

988988

989989

‎trunk/src/libcollections/dlist.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ impl<'a, A> DoubleEndedIterator<&'a A> for Items<'a, A> {
607607
}
608608
}
609609

610-
impl<'a, A> ExactSizeIterator<&'a A> for Items<'a, A> {}
610+
impl<'a, A> ExactSize<&'a A> for Items<'a, A> {}
611611

612612
impl<'a, A> Iterator<&'a mut A> for MutItems<'a, A> {
613613
#[inline]
@@ -645,7 +645,7 @@ impl<'a, A> DoubleEndedIterator<&'a mut A> for MutItems<'a, A> {
645645
}
646646
}
647647

648-
impl<'a, A> ExactSizeIterator<&'a mut A> for MutItems<'a, A> {}
648+
impl<'a, A> ExactSize<&'a mut A> for MutItems<'a, A> {}
649649

650650
/// Allows mutating a `DList` while iterating.
651651
pub trait ListInsertion<A> {

‎trunk/src/libcollections/ring_buf.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,8 @@ impl<'a, T> DoubleEndedIterator<&'a T> for Items<'a, T> {
695695
}
696696
}
697697

698-
impl<'a, T> ExactSizeIterator<&'a T> for Items<'a, T> {}
698+
699+
impl<'a, T> ExactSize<&'a T> for Items<'a, T> {}
699700

700701
impl<'a, T> RandomAccessIterator<&'a T> for Items<'a, T> {
701702
#[inline]
@@ -762,7 +763,7 @@ impl<'a, T> DoubleEndedIterator<&'a mut T> for MutItems<'a, T> {
762763
}
763764
}
764765

765-
impl<'a, T> ExactSizeIterator<&'a mut T> for MutItems<'a, T> {}
766+
impl<'a, T> ExactSize<&'a mut T> for MutItems<'a, T> {}
766767

767768
impl<A: PartialEq> PartialEq for RingBuf<A> {
768769
fn eq(&self, other: &RingBuf<A>) -> bool {
@@ -1321,7 +1322,7 @@ mod tests {
13211322
let u: Vec<int> = deq.iter().map(|&x| x).collect();
13221323
assert_eq!(u, v);
13231324

1324-
let seq = iter::count(0u, 2).take(256);
1325+
let mut seq = iter::count(0u, 2).take(256);
13251326
let deq: RingBuf<uint> = seq.collect();
13261327
for (i, &x) in deq.iter().enumerate() {
13271328
assert_eq!(2*i, x);

‎trunk/src/libcollections/slice.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ use core::cmp;
9494
use core::kinds::Sized;
9595
use core::mem::size_of;
9696
use core::mem;
97-
use core::prelude::{Clone, Greater, Iterator, IteratorExt, Less, None, Option};
97+
use core::prelude::{Clone, Greater, Iterator, Less, None, Option};
9898
use core::prelude::{Ord, Ordering, RawPtr, Some, range};
9999
use core::ptr;
100100
use core::iter::{range_step, MultiplicativeIterator};

‎trunk/src/libcollections/str.rs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ use core::cmp;
6161
use core::iter::AdditiveIterator;
6262
use core::kinds::Sized;
6363
use core::prelude::{Char, Clone, Eq, Equiv};
64-
use core::prelude::{Iterator, IteratorExt, SlicePrelude, None, Option, Ord, Ordering};
64+
use core::prelude::{Iterator, SlicePrelude, None, Option, Ord, Ordering};
6565
use core::prelude::{PartialEq, PartialOrd, Result, AsSlice, Some, Tuple2};
6666
use core::prelude::{range};
6767

@@ -828,7 +828,7 @@ mod tests {
828828
use std::cmp::{Equal, Greater, Less, Ord, PartialOrd, Equiv};
829829
use std::option::{Some, None};
830830
use std::ptr::RawPtr;
831-
use std::iter::{Iterator, IteratorExt, DoubleEndedIteratorExt};
831+
use std::iter::{Iterator, DoubleEndedIterator};
832832

833833
use super::*;
834834
use std::slice::{AsSlice, SlicePrelude};
@@ -2177,15 +2177,12 @@ mod tests {
21772177
let gr_inds = s.grapheme_indices(true).rev().collect::<Vec<(uint, &str)>>();
21782178
let b: &[_] = &[(11, "\r\n"), (6, "ö̲"), (3, "é"), (0u, "a̐")];
21792179
assert_eq!(gr_inds.as_slice(), b);
2180-
let mut gr_inds_iter = s.grapheme_indices(true);
2181-
{
2182-
let gr_inds = gr_inds_iter.by_ref();
2183-
let e1 = gr_inds.size_hint();
2184-
assert_eq!(e1, (1, Some(13)));
2185-
let c = gr_inds.count();
2186-
assert_eq!(c, 4);
2187-
}
2188-
let e2 = gr_inds_iter.size_hint();
2180+
let mut gr_inds = s.grapheme_indices(true);
2181+
let e1 = gr_inds.size_hint();
2182+
assert_eq!(e1, (1, Some(13)));
2183+
let c = gr_inds.count();
2184+
assert_eq!(c, 4);
2185+
let e2 = gr_inds.size_hint();
21892186
assert_eq!(e2, (0, Some(0)));
21902187

21912188
// make sure the reverse iterator does the right thing with "\n" at beginning of string
@@ -2322,7 +2319,7 @@ mod bench {
23222319
use test::Bencher;
23232320
use test::black_box;
23242321
use super::*;
2325-
use std::iter::{IteratorExt, DoubleEndedIteratorExt};
2322+
use std::iter::{Iterator, DoubleEndedIterator};
23262323
use std::str::StrPrelude;
23272324
use std::slice::SlicePrelude;
23282325

0 commit comments

Comments
 (0)