Skip to content

Commit c148e7c

Browse files
alexcrichtonalexcrichton
committed
---
yaml --- r: 188406 b: refs/heads/tmp c: eca6dac h: refs/heads/master v: v3
1 parent 96e708a commit c148e7c

File tree

296 files changed

+766
-687
lines changed

Some content is hidden

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

296 files changed

+766
-687
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3434
refs/heads/beta: 522d09dfecbeca1595f25ac58c6d0178bbd21d7d
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
37-
refs/heads/tmp: 241727326ebccd5ae40557b36f35317df25b3150
37+
refs/heads/tmp: eca6dacdc1c2029335675d6c3f93f09097e87e54
3838
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

‎branches/tmp/mk/debuggers.mk

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,32 +56,29 @@ define DEF_INSTALL_DEBUGGER_SCRIPTS_HOST
5656
tmp/install-debugger-scripts$(1)_H_$(2)-gdb.done: \
5757
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) \
5858
$$(DEBUGGER_BIN_SCRIPTS_GDB_ABS)
59-
$(Q)touch $$@.start_time
6059
$(Q)mkdir -p $$(HBIN$(1)_H_$(2))
6160
$(Q)mkdir -p $$(HLIB$(1)_H_$(2))/rustlib/etc
6261
$(Q)install $$(DEBUGGER_BIN_SCRIPTS_GDB_ABS) $$(HBIN$(1)_H_$(2))
6362
$(Q)install $$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) $$(HLIB$(1)_H_$(2))/rustlib/etc
64-
$(Q)touch -r $$@.start_time $$@ && rm $$@.start_time
63+
$(Q)touch $$@
6564

6665
tmp/install-debugger-scripts$(1)_H_$(2)-lldb.done: \
6766
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS) \
6867
$$(DEBUGGER_BIN_SCRIPTS_LLDB_ABS)
69-
$(Q)touch $$@.start_time
7068
$(Q)mkdir -p $$(HBIN$(1)_H_$(2))
7169
$(Q)mkdir -p $$(HLIB$(1)_H_$(2))/rustlib/etc
7270
$(Q)install $$(DEBUGGER_BIN_SCRIPTS_LLDB_ABS) $$(HBIN$(1)_H_$(2))
7371
$(Q)install $$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS) $$(HLIB$(1)_H_$(2))/rustlib/etc
74-
$(Q)touch -r $$@.start_time $$@ && rm $$@.start_time
72+
$(Q)touch $$@
7573

7674
tmp/install-debugger-scripts$(1)_H_$(2)-all.done: \
7775
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS) \
7876
$$(DEBUGGER_BIN_SCRIPTS_ALL_ABS)
79-
$(Q)touch $$@.start_time
8077
$(Q)mkdir -p $$(HBIN$(1)_H_$(2))
8178
$(Q)mkdir -p $$(HLIB$(1)_H_$(2))/rustlib/etc
8279
$(Q)install $$(DEBUGGER_BIN_SCRIPTS_ALL_ABS) $$(HBIN$(1)_H_$(2))
8380
$(Q)install $$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS) $$(HLIB$(1)_H_$(2))/rustlib/etc
84-
$(Q)touch -r $$@.start_time $$@ && rm $$@.start_time
81+
$(Q)touch $$@
8582

8683
tmp/install-debugger-scripts$(1)_H_$(2)-none.done:
8784
$(Q)touch $$@
@@ -101,32 +98,29 @@ define DEF_INSTALL_DEBUGGER_SCRIPTS_TARGET
10198
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3)-gdb.done: \
10299
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) \
103100
$$(DEBUGGER_BIN_SCRIPTS_GDB_ABS)
104-
$(Q)touch $$@.start_time
105101
$(Q)mkdir -p $$(TBIN$(1)_T_$(2)_H_$(3))
106102
$(Q)mkdir -p $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
107103
$(Q)install $(DEBUGGER_BIN_SCRIPTS_GDB_ABS) $$(TBIN$(1)_T_$(2)_H_$(3))
108104
$(Q)install $(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
109-
$(Q)touch -r $$@.start_time $$@ && rm $$@.start_time
105+
$(Q)touch $$@
110106

111107
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3)-lldb.done: \
112108
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS) \
113109
$$(DEBUGGER_BIN_SCRIPTS_LLDB_ABS)
114-
$(Q)touch $$@.start_time
115110
$(Q)mkdir -p $$(TBIN$(1)_T_$(2)_H_$(3))
116111
$(Q)mkdir -p $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
117112
$(Q)install $(DEBUGGER_BIN_SCRIPTS_LLDB_ABS) $$(TBIN$(1)_T_$(2)_H_$(3))
118113
$(Q)install $(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS) $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
119-
$(Q)touch -r $$@.start_time $$@ && rm $$@.start_time
114+
$(Q)touch $$@
120115

121116
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3)-all.done: \
122117
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS) \
123118
$$(DEBUGGER_BIN_SCRIPTS_ALL_ABS)
124-
$(Q)touch $$@.start_time
125119
$(Q)mkdir -p $$(TBIN$(1)_T_$(2)_H_$(3))
126120
$(Q)mkdir -p $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
127121
$(Q)install $(DEBUGGER_BIN_SCRIPTS_ALL_ABS) $$(TBIN$(1)_T_$(2)_H_$(3))
128122
$(Q)install $(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS) $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
129-
$(Q)touch -r $$@.start_time $$@ && rm $$@.start_time
123+
$(Q)touch $$@
130124

131125
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3)-none.done:
132126
$(Q)touch $$@

‎branches/tmp/mk/llvm.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,9 @@ endif
3838
# the stamp in the source dir.
3939
$$(LLVM_STAMP_$(1)): $(S)src/rustllvm/llvm-auto-clean-trigger
4040
@$$(call E, make: cleaning llvm)
41-
$(Q)touch $$@.start_time
4241
$(Q)$(MAKE) clean-llvm$(1)
4342
@$$(call E, make: done cleaning llvm)
44-
touch -r $$@.start_time $$@ && rm $$@.start_time
43+
touch $$@
4544

4645
ifeq ($$(CFG_ENABLE_LLVM_STATIC_STDCPP),1)
4746
LLVM_STDCPP_LOCATION_$(1) = $$(shell $$(CC_$(1)) $$(CFG_GCCISH_CFLAGS_$(1)) \

‎branches/tmp/mk/target.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
7575
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
7676
| $$(TLIB$(1)_T_$(2)_H_$(3))/
7777
@$$(call E, rustc: $$(@D)/lib$(4))
78-
@touch $$@.start_time
7978
$$(call REMOVE_ALL_OLD_GLOB_MATCHES, \
8079
$$(dir $$@)$$(call CFG_LIB_GLOB_$(2),$(4)))
8180
$$(call REMOVE_ALL_OLD_GLOB_MATCHES, \
@@ -90,7 +89,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
9089
--out-dir $$(@D) \
9190
-C extra-filename=-$$(CFG_FILENAME_EXTRA) \
9291
$$<
93-
@touch -r $$@.start_time $$@ && rm $$@.start_time
92+
@touch $$@
9493
$$(call LIST_ALL_OLD_GLOB_MATCHES, \
9594
$$(dir $$@)$$(call CFG_LIB_GLOB_$(2),$(4)))
9695
$$(call LIST_ALL_OLD_GLOB_MATCHES, \

‎branches/tmp/mk/tests.mk

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -389,11 +389,10 @@ check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4
389389
$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
390390
$(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2))
391391
@$$(call E, run: $$<)
392-
$$(Q)touch $$@.start_time
393392
$$(Q)$$(call CFG_RUN_TEST_$(2),$$<,$(1),$(2),$(3)) $$(TESTARGS) \
394393
--logfile $$(call TEST_LOG_FILE,$(1),$(2),$(3),$(4)) \
395394
$$(call CRATE_TEST_EXTRA_ARGS,$(1),$(2),$(3),$(4)) \
396-
&& touch -r $$@.start_time $$@ && rm $$@.start_time
395+
&& touch $$@
397396
endef
398397

399398
define DEF_TEST_CRATE_RULES_android
@@ -402,7 +401,6 @@ check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4
402401
$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
403402
$(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2))
404403
@$$(call E, run: $$< via adb)
405-
$$(Q)touch $$@.start_time
406404
$$(Q)$(CFG_ADB) push $$< $(CFG_ADB_TEST_DIR)
407405
$$(Q)$(CFG_ADB) shell '(cd $(CFG_ADB_TEST_DIR); LD_LIBRARY_PATH=./$(2) \
408406
./$$(notdir $$<) \
@@ -416,7 +414,7 @@ $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
416414
@if grep -q "result: ok" tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp; \
417415
then \
418416
rm tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp; \
419-
touch -r $$@.start_time $$@ && rm $$@.start_time; \
417+
touch $$@; \
420418
else \
421419
rm tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp; \
422420
exit 101; \
@@ -590,7 +588,7 @@ TEST_SREQ$(1)_T_$(2)_H_$(3) = \
590588

591589
# The tests select when to use debug configuration on their own;
592590
# remove directive, if present, from CFG_RUSTC_FLAGS (issue #7898).
593-
CTEST_RUSTC_FLAGS := $$(subst --cfg ndebug,,$$(CFG_RUSTC_FLAGS))
591+
CTEST_RUSTC_FLAGS := $$(subst -C debug-assertions,,$$(CFG_RUSTC_FLAGS))
594592

595593
# The tests cannot be optimized while the rest of the compiler is optimized, so
596594
# filter out the optimization (if any) from rustc and then figure out if we need
@@ -692,11 +690,10 @@ $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
692690
$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
693691
$$(CTEST_DEPS_$(4)_$(1)-T-$(2)-H-$(3))
694692
@$$(call E, run $(4) [$(2)]: $$<)
695-
$$(Q)touch [email protected]_time
696693
$$(Q)$$(call CFG_RUN_CTEST_$(2),$(1),$$<,$(3)) \
697694
$$(CTEST_ARGS$(1)-T-$(2)-H-$(3)-$(4)) \
698695
--logfile $$(call TEST_LOG_FILE,$(1),$(2),$(3),$(4)) \
699-
&& touch -r $$@.start_time $$@ && rm [email protected]_time
696+
&& touch $$@
700697

701698
else
702699

@@ -753,11 +750,10 @@ $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
753750
$$(PRETTY_DEPS_$(4)) \
754751
$$(PRETTY_DEPS$(1)_H_$(3)_$(4))
755752
@$$(call E, run pretty-rpass [$(2)]: $$<)
756-
$$(Q)touch $$@.start_time
757753
$$(Q)$$(call CFG_RUN_CTEST_$(2),$(1),$$<,$(3)) \
758754
$$(PRETTY_ARGS$(1)-T-$(2)-H-$(3)-$(4)) \
759755
--logfile $$(call TEST_LOG_FILE,$(1),$(2),$(3),$(4)) \
760-
&& touch -r $$@.start_time $$@ && rm $$@.start_time
756+
&& touch $$@
761757

762758
endef
763759

@@ -803,10 +799,8 @@ endif
803799
ifeq ($(2),$$(CFG_BUILD))
804800
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)): $$(DOCTESTDEP_$(1)_$(2)_$(3)_$(4))
805801
@$$(call E, run doc-$(4) [$(2)])
806-
$$(Q)touch $$@.start_time
807802
$$(Q)$$(RUSTDOC_$(1)_T_$(2)_H_$(3)) --cfg dox --test $$< \
808-
--test-args "$$(TESTARGS)" && \
809-
touch -r $$@.start_time $$@ && rm $$@.start_time
803+
--test-args "$$(TESTARGS)" && touch $$@
810804
else
811805
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)):
812806
touch $$@
@@ -841,11 +835,9 @@ check-stage$(1)-T-$(2)-H-$(3)-doc-crate-$(4)-exec: \
841835
ifeq ($(2),$$(CFG_BUILD))
842836
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-crate-$(4)): $$(CRATEDOCTESTDEP_$(1)_$(2)_$(3)_$(4))
843837
@$$(call E, run doc-crate-$(4) [$(2)])
844-
$$(Q)touch $$@.start_time
845838
$$(Q)CFG_LLVM_LINKAGE_FILE=$$(LLVM_LINKAGE_PATH_$(3)) \
846839
$$(RUSTDOC_$(1)_T_$(2)_H_$(3)) --test --cfg dox \
847-
$$(CRATEFILE_$(4)) --test-args "$$(TESTARGS)" && \
848-
touch -r $$@.start_time $$@ && rm $$@.start_time
840+
$$(CRATEFILE_$(4)) --test-args "$$(TESTARGS)" && touch $$@
849841
else
850842
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-crate-$(4)):
851843
touch $$@
@@ -992,7 +984,6 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
992984
$$(CSREQ$(1)_T_$(2)_H_$(3))
993985
@rm -rf $(3)/test/run-make/$$*
994986
@mkdir -p $(3)/test/run-make/$$*
995-
$$(Q)touch $$@.start_time
996987
$$(Q)$$(CFG_PYTHON) $(S)src/etc/maketest.py $$(dir $$<) \
997988
$$(MAKE) \
998989
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
@@ -1005,7 +996,7 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
1005996
"$$(LD_LIBRARY_PATH_ENV_TARGETDIR$(1)_T_$(2)_H_$(3))" \
1006997
$(1) \
1007998
$$(S)
1008-
@touch -r $$@.start_time $$@ && rm [email protected]_time
999+
@touch $$@
10091000
else
10101001
# FIXME #11094 - The above rule doesn't work right for multiple targets
10111002
check-stage$(1)-T-$(2)-H-$(3)-rmake-exec:

‎branches/tmp/src/doc/trpl/pointers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ fn main() {
709709
one_hundred: 100,
710710
});
711711

712-
let y: Box<BigStruct> = box foo(x);
712+
let y = box foo(x);
713713
}
714714
```
715715

‎branches/tmp/src/liballoc/arc.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@
6969
//! }
7070
//! ```
7171
72-
use boxed::Box;
73-
7472
use core::prelude::*;
7573

7674
use core::atomic;
@@ -172,7 +170,7 @@ impl<T> Arc<T> {
172170
pub fn new(data: T) -> Arc<T> {
173171
// Start the weak pointer count as 1 which is the weak pointer that's
174172
// held by all the strong pointers (kinda), see std/rc.rs for more info
175-
let x: Box<_> = box ArcInner {
173+
let x = box ArcInner {
176174
strong: atomic::AtomicUsize::new(1),
177175
weak: atomic::AtomicUsize::new(1),
178176
data: data,

‎branches/tmp/src/liballoc/boxed.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ impl<T> Box<T> {
9494
/// let x = Box::new(5);
9595
/// ```
9696
#[stable(feature = "rust1", since = "1.0.0")]
97-
#[inline(always)]
9897
pub fn new(x: T) -> Box<T> {
9998
box x
10099
}
@@ -157,7 +156,7 @@ impl<T: Default> Default for Box<T> {
157156
#[stable(feature = "rust1", since = "1.0.0")]
158157
impl<T> Default for Box<[T]> {
159158
#[stable(feature = "rust1", since = "1.0.0")]
160-
fn default() -> Box<[T]> { Box::<[T; 0]>::new([]) }
159+
fn default() -> Box<[T]> { box [] }
161160
}
162161

163162
#[stable(feature = "rust1", since = "1.0.0")]

‎branches/tmp/src/liballoc/heap.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,6 @@ mod test {
387387
extern crate test;
388388
use self::test::Bencher;
389389
use core::ptr::PtrExt;
390-
use boxed::Box;
391390
use heap;
392391

393392
#[test]
@@ -405,7 +404,7 @@ mod test {
405404
#[bench]
406405
fn alloc_owned_small(b: &mut Bencher) {
407406
b.iter(|| {
408-
let _: Box<_> = box 10;
407+
box 10
409408
})
410409
}
411410
}

‎branches/tmp/src/liballoc/lib.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,9 @@ pub mod heap;
9696

9797
// Primitive types using the heaps above
9898

99-
// Need to conditionally define the mod from `boxed.rs` to avoid
100-
// duplicating the lang-items when building in test cfg; but also need
101-
// to allow code to have `use boxed::HEAP;`
102-
// and `use boxed::Box;` declarations.
10399
#[cfg(not(test))]
104100
pub mod boxed;
105101
#[cfg(test)]
106-
mod boxed { pub use std::boxed::{Box, HEAP}; }
107-
#[cfg(test)]
108102
mod boxed_test;
109103
pub mod arc;
110104
pub mod rc;

‎branches/tmp/src/liballoc/rc.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,6 @@ impl<T> RcBoxPtr<T> for Weak<T> {
795795
#[cfg(test)]
796796
mod tests {
797797
use super::{Rc, Weak, weak_count, strong_count};
798-
use std::boxed::Box;
799798
use std::cell::RefCell;
800799
use std::option::Option;
801800
use std::option::Option::{Some, None};
@@ -827,7 +826,7 @@ mod tests {
827826

828827
#[test]
829828
fn test_destructor() {
830-
let x: Rc<Box<_>> = Rc::new(box 5);
829+
let x = Rc::new(box 5);
831830
assert_eq!(**x, 5);
832831
}
833832

‎branches/tmp/src/libarena/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -581,11 +581,11 @@ mod tests {
581581
#[bench]
582582
pub fn bench_copy_nonarena(b: &mut Bencher) {
583583
b.iter(|| {
584-
let _: Box<_> = box Point {
584+
box Point {
585585
x: 1,
586586
y: 2,
587587
z: 3,
588-
};
588+
}
589589
})
590590
}
591591

@@ -634,10 +634,10 @@ mod tests {
634634
#[bench]
635635
pub fn bench_noncopy_nonarena(b: &mut Bencher) {
636636
b.iter(|| {
637-
let _: Box<_> = box Noncopy {
637+
box Noncopy {
638638
string: "hello world".to_string(),
639639
array: vec!( 1, 2, 3, 4, 5 ),
640-
};
640+
}
641641
})
642642
}
643643

‎branches/tmp/src/libcollections/binary_heap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ mod tests {
790790

791791
#[test]
792792
fn test_push_unique() {
793-
let mut heap = BinaryHeap::<Box<_>>::from_vec(vec![box 2, box 4, box 9]);
793+
let mut heap = BinaryHeap::from_vec(vec![box 2, box 4, box 9]);
794794
assert_eq!(heap.len(), 3);
795795
assert!(*heap.peek().unwrap() == box 9);
796796
heap.push(box 11);

‎branches/tmp/src/libcollections/linked_list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,7 @@ mod tests {
984984

985985
#[test]
986986
fn test_basic() {
987-
let mut m = LinkedList::<Box<_>>::new();
987+
let mut m = LinkedList::new();
988988
assert_eq!(m.pop_front(), None);
989989
assert_eq!(m.pop_back(), None);
990990
assert_eq!(m.pop_front(), None);

0 commit comments

Comments
 (0)