Skip to content

Commit 18d79d0

Browse files
dotdashdotdash
committed
---
yaml --- r: 126765 b: refs/heads/snap-stage3 c: 0d6f257 h: refs/heads/master i: 126763: 203dffd v: v3
1 parent 5d005d8 commit 18d79d0

File tree

58 files changed

+348
-396
lines changed

Some content is hidden

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

58 files changed

+348
-396
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: 7be8f0af0393dcdb077c2f6b1653836fd3fba235
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 02464196eaf56838c16d747e77536cefd14c5238
4+
refs/heads/snap-stage3: 0d6f2576573534215fc3a6cb96a3fd5d5e813cf7
55
refs/heads/try: 502e4c045236682e9728539dc0d2b3d0b237f55c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

‎branches/snap-stage3/configure

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,8 +422,6 @@ opt rpath 0 "build rpaths into rustc itself"
422422
opt nightly 0 "build nightly packages"
423423
opt verify-install 1 "verify installed binaries work"
424424
opt jemalloc 1 "build liballoc with jemalloc"
425-
# This is used by the automation to produce single-target nightlies
426-
opt dist-host-only 0 "only install bins for the host architecture"
427425
valopt prefix "/usr/local" "set installation prefix"
428426
valopt local-rust-root "/usr/local" "set prefix for local rust binary"
429427
valopt llvm-root "" "set LLVM root"

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

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ define DEF_OSX_PKG
156156
$$(eval $$(call DEF_PREPARE,osx-$(1)))
157157

158158
dist-prepare-osx-$(1): PREPARE_HOST=$(1)
159-
dist-prepare-osx-$(1): PREPARE_TARGETS=$(2)
159+
dist-prepare-osx-$(1): PREPARE_TARGETS=$(1)
160160
dist-prepare-osx-$(1): PREPARE_DEST_DIR=tmp/dist/pkgroot-$(1)
161161
dist-prepare-osx-$(1): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
162162
dist-prepare-osx-$(1): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
@@ -187,11 +187,7 @@ tmp/dist/pkgres-$(1)/%: $(S)src/etc/pkg/%
187187

188188
endef
189189

190-
ifneq ($(CFG_ENABLE_DIST_HOST_ONLY),)
191-
$(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host),$(host))))
192-
else
193-
$(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host),$(TARGET))))
194-
endif
190+
$(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host))))
195191

196192
dist-osx: $(foreach host,$(CFG_HOST),dist/$(PKG_NAME)-$(host).pkg)
197193

@@ -209,19 +205,17 @@ distcheck-osx: dist-osx
209205
# Unix binary installer tarballs
210206
######################################################################
211207

212-
define DEF_INSTALLER
213-
214-
$$(eval $$(call DEF_PREPARE,dir-$(1)))
215-
216-
dist-install-dir-$(1): PREPARE_HOST=$(1)
217-
dist-install-dir-$(1): PREPARE_TARGETS=$(2)
218-
dist-install-dir-$(1): PREPARE_DEST_DIR=tmp/dist/$$(PKG_NAME)-$(1)
219-
dist-install-dir-$(1): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
220-
dist-install-dir-$(1): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
221-
dist-install-dir-$(1): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
222-
dist-install-dir-$(1): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD)
223-
dist-install-dir-$(1): PREPARE_CLEAN=true
224-
dist-install-dir-$(1): prepare-base-dir-$(1) docs compiler-docs
208+
define DEF_PREPARE_DIST_DIR
209+
210+
dist-install-dir-$(1)$(3): PREPARE_HOST=$(1)
211+
dist-install-dir-$(1)$(3): PREPARE_TARGETS=$(2)
212+
dist-install-dir-$(1)$(3): PREPARE_DEST_DIR=tmp/dist/$$(PKG_NAME)-$(1)
213+
dist-install-dir-$(1)$(3): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
214+
dist-install-dir-$(1)$(3): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
215+
dist-install-dir-$(1)$(3): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
216+
dist-install-dir-$(1)$(3): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD)
217+
dist-install-dir-$(1)$(3): PREPARE_CLEAN=true
218+
dist-install-dir-$(1)$(3): prepare-base-dir-$(1) docs compiler-docs
225219
$$(Q)(cd $$(PREPARE_DEST_DIR)/ && find . -type f | sed 's/^\.\///') \
226220
> tmp/dist/manifest-$(1).in
227221
$$(Q)mv tmp/dist/manifest-$(1).in $$(PREPARE_DEST_DIR)/$$(CFG_LIBDIR_RELATIVE)/rustlib/manifest.in
@@ -233,19 +227,24 @@ dist-install-dir-$(1): prepare-base-dir-$(1) docs compiler-docs
233227
$$(Q)cp -r doc $$(PREPARE_DEST_DIR)
234228
$$(Q)$$(PREPARE_BIN_CMD) $$(S)src/etc/install.sh $$(PREPARE_DEST_DIR)
235229

230+
endef
231+
232+
define DEF_INSTALLER
233+
234+
$$(eval $$(call DEF_PREPARE,dir-$(1)))
235+
236+
$$(eval $$(call DEF_PREPARE_DIST_DIR,$(1),$(1),))
237+
238+
$$(eval $$(call DEF_PREPARE_DIST_DIR,$(1),$(CFG_TARGET),-with-target-libs))
239+
236240
dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1)
237241
@$(call E, build: $$@)
238242
$$(Q)tar -czf dist/$$(PKG_NAME)-$(1).tar.gz -C tmp/dist $$(PKG_NAME)-$(1)
239243

240244
endef
241245

242-
ifneq ($(CFG_ENABLE_DIST_HOST_ONLY),)
243-
$(foreach host,$(CFG_HOST),\
244-
$(eval $(call DEF_INSTALLER,$(host),$(host))))
245-
else
246246
$(foreach host,$(CFG_HOST),\
247-
$(eval $(call DEF_INSTALLER,$(host),$(CFG_TARGET))))
248-
endif
247+
$(eval $(call DEF_INSTALLER,$(host))))
249248

250249
dist-install-dirs: $(foreach host,$(CFG_HOST),dist-install-dir-$(host))
251250

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ else
1414
MAYBE_DISABLE_VERIFY=
1515
endif
1616

17-
install: dist-install-dir-$(CFG_BUILD) | tmp/empty_dir
17+
install: dist-install-dir-$(CFG_BUILD)-with-target-libs | tmp/empty_dir
1818
$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)"
1919
# Remove tmp files while we can because they may have been created under sudo
2020
$(Q)rm -R tmp/dist
2121

22-
uninstall: dist-install-dir-$(CFG_BUILD) | tmp/empty_dir
22+
uninstall: dist-install-dir-$(CFG_BUILD)-with-target-libs | tmp/empty_dir
2323
$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
2424
# Remove tmp files while we can because they may have been created under sudo
2525
$(Q)rm -R tmp/dist

‎branches/snap-stage3/src/compiletest/runtest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1178,7 +1178,7 @@ fn make_run_args(config: &Config, props: &TestProps, testfile: &Path) ->
11781178
// Add the arguments in the run_flags directive
11791179
args.push_all_move(split_maybe_args(&props.run_flags));
11801180

1181-
let prog = args.remove(0).unwrap();
1181+
let prog = args.shift().unwrap();
11821182
return ProcArgs {
11831183
prog: prog,
11841184
args: args,

‎branches/snap-stage3/src/doc/intro.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ fn main() {
276276
277277
spawn(proc() {
278278
let numbers = rx.recv();
279-
println!("{:d}", numbers[num]);
279+
println!("{:d}", numbers[num as uint]);
280280
})
281281
}
282282
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ syn keyword rustTrait Clone
100100
syn keyword rustTrait PartialEq PartialOrd Eq Ord Equiv
101101
syn keyword rustEnum Ordering
102102
syn keyword rustEnumVariant Less Equal Greater
103-
syn keyword rustTrait Collection Mutable Map MutableMap MutableSeq
103+
syn keyword rustTrait Collection Mutable Map MutableMap
104104
syn keyword rustTrait Set MutableSet
105105
syn keyword rustTrait FromIterator Extendable ExactSize
106106
syn keyword rustTrait Iterator DoubleEndedIterator

‎branches/snap-stage3/src/liballoc/arc.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ impl<T: Share + Send> Drop for Weak<T> {
268268
#[allow(experimental)]
269269
mod tests {
270270
use std::clone::Clone;
271-
use std::collections::MutableSeq;
272271
use std::comm::channel;
273272
use std::mem::drop;
274273
use std::ops::Drop;

‎branches/snap-stage3/src/libcollections/bitv.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ use core::slice;
7272
use core::uint;
7373
use std::hash;
7474

75-
use {Collection, Mutable, Set, MutableSet, MutableSeq};
75+
use {Collection, Mutable, Set, MutableSet};
7676
use vec::Vec;
7777

7878

@@ -1574,7 +1574,7 @@ mod tests {
15741574
use std::rand::Rng;
15751575
use test::Bencher;
15761576

1577-
use {Set, Mutable, MutableSet, MutableSeq};
1577+
use {Set, Mutable, MutableSet};
15781578
use bitv::{Bitv, BitvSet, from_fn, from_bytes};
15791579
use bitv;
15801580
use vec::Vec;

‎branches/snap-stage3/src/libcollections/btree.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use alloc::boxed::Box;
2424
use core::fmt;
2525
use core::fmt::Show;
2626

27-
use {Collection, MutableSeq};
27+
use Collection;
2828
use vec::Vec;
2929

3030
#[allow(missing_doc)]
@@ -782,8 +782,6 @@ mod test_btree {
782782

783783
use super::{BTree, Node, LeafElt};
784784

785-
use MutableSeq;
786-
787785
//Tests the functionality of the insert methods (which are unfinished).
788786
#[test]
789787
fn insert_test_one() {

‎branches/snap-stage3/src/libcollections/dlist.rs

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use core::iter;
3030
use core::mem;
3131
use core::ptr;
3232

33-
use {Collection, Mutable, Deque, MutableSeq};
33+
use {Collection, Mutable, Deque};
3434

3535
/// A doubly-linked list.
3636
pub struct DList<T> {
@@ -249,13 +249,18 @@ impl<T> Deque<T> for DList<T> {
249249
fn pop_front(&mut self) -> Option<T> {
250250
self.pop_front_node().map(|box Node{value, ..}| value)
251251
}
252-
}
253252

254-
impl<T> MutableSeq<T> for DList<T> {
255-
fn push(&mut self, elt: T) {
253+
/// Add an element last in the list
254+
///
255+
/// O(1)
256+
fn push_back(&mut self, elt: T) {
256257
self.push_back_node(box Node::new(elt))
257258
}
258-
fn pop(&mut self) -> Option<T> {
259+
260+
/// Remove the last element and return it, or None if the list is empty
261+
///
262+
/// O(1)
263+
fn pop_back(&mut self) -> Option<T> {
259264
self.pop_back_node().map(|box Node{value, ..}| value)
260265
}
261266
}
@@ -279,12 +284,12 @@ impl<T> DList<T> {
279284
/// # Example
280285
///
281286
/// ```rust
282-
/// use std::collections::DList;
287+
/// use std::collections::{DList, Deque};
283288
///
284289
/// let mut dl = DList::new();
285-
/// dl.push(1i);
286-
/// dl.push(2);
287-
/// dl.push(3);
290+
/// dl.push_back(1i);
291+
/// dl.push_back(2);
292+
/// dl.push_back(3);
288293
///
289294
/// dl.rotate_forward();
290295
///
@@ -306,12 +311,12 @@ impl<T> DList<T> {
306311
/// # Example
307312
///
308313
/// ```rust
309-
/// use std::collections::DList;
314+
/// use std::collections::{DList, Deque};
310315
///
311316
/// let mut dl = DList::new();
312-
/// dl.push(1i);
313-
/// dl.push(2);
314-
/// dl.push(3);
317+
/// dl.push_back(1i);
318+
/// dl.push_back(2);
319+
/// dl.push_back(3);
315320
///
316321
/// dl.rotate_backward();
317322
///
@@ -333,14 +338,14 @@ impl<T> DList<T> {
333338
/// # Example
334339
///
335340
/// ```rust
336-
/// use std::collections::DList;
341+
/// use std::collections::{DList, Deque};
337342
///
338343
/// let mut a = DList::new();
339344
/// let mut b = DList::new();
340-
/// a.push(1i);
341-
/// a.push(2);
342-
/// b.push(3i);
343-
/// b.push(4);
345+
/// a.push_back(1i);
346+
/// a.push_back(2);
347+
/// b.push_back(3i);
348+
/// b.push_back(4);
344349
///
345350
/// a.append(b);
346351
///
@@ -374,14 +379,14 @@ impl<T> DList<T> {
374379
/// # Example
375380
///
376381
/// ```rust
377-
/// use std::collections::DList;
382+
/// use std::collections::{DList, Deque};
378383
///
379384
/// let mut a = DList::new();
380385
/// let mut b = DList::new();
381-
/// a.push(1i);
382-
/// a.push(2);
383-
/// b.push(3i);
384-
/// b.push(4);
386+
/// a.push_back(1i);
387+
/// a.push_back(2);
388+
/// b.push_back(3i);
389+
/// b.push_back(4);
385390
///
386391
/// a.prepend(b);
387392
///
@@ -403,13 +408,13 @@ impl<T> DList<T> {
403408
/// # Example
404409
///
405410
/// ```rust
406-
/// use std::collections::DList;
411+
/// use std::collections::{DList, Deque};
407412
///
408413
/// let mut a: DList<int> = DList::new();
409-
/// a.push(2i);
410-
/// a.push(4);
411-
/// a.push(7);
412-
/// a.push(8);
414+
/// a.push_back(2i);
415+
/// a.push_back(4);
416+
/// a.push_back(7);
417+
/// a.push_back(8);
413418
///
414419
/// // insert 11 before the first odd number in the list
415420
/// a.insert_when(11, |&e, _| e % 2 == 1);
@@ -714,7 +719,7 @@ mod tests {
714719
use test::Bencher;
715720
use test;
716721

717-
use {Deque, MutableSeq};
722+
use Deque;
718723
use super::{DList, Node, ListInsertion};
719724
use vec::Vec;
720725

‎branches/snap-stage3/src/libcollections/enum_set.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,6 @@ mod test {
141141

142142
use enum_set::{EnumSet, CLike};
143143

144-
use MutableSeq;
145-
146144
#[deriving(PartialEq, Show)]
147145
#[repr(uint)]
148146
enum Foo {

‎branches/snap-stage3/src/libcollections/hash/sip.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,6 @@ mod tests {
281281
use super::super::{Hash, Writer};
282282
use super::{SipState, hash, hash_with_keys};
283283

284-
use MutableSeq;
285-
286284
// Hash just the bytes of the slice, without length prefix
287285
struct Bytes<'a>(&'a [u8]);
288286

0 commit comments

Comments
 (0)