Skip to content

Commit cfecbb9

Browse files
pnkfelixpnkfelix
committed
---
yaml --- r: 66999 b: refs/heads/master c: a1cd142 h: refs/heads/master i: 66997: 7932689 66995: 38ba898 66991: 9935cd4 v: v3
1 parent a2f44b1 commit cfecbb9

File tree

11 files changed

+37
-37
lines changed

11 files changed

+37
-37
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: ff9b75f26d8784c38ff6fbdb55511204f75a8a72
2+
refs/heads/master: a1cd1429fb6f007735a3de792b5ba8ba24cd5328
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

‎trunk/configure

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -921,9 +921,6 @@ do
921921
esac
922922
need_ok "LLVM configure failed"
923923

924-
# Hack the tools Makefile to turn off the clang build
925-
sed -i 's/clang//g' tools/Makefile
926-
927924
cd $CFG_BUILD_DIR
928925
fi
929926

‎trunk/src/libextra/bitv.rs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -893,9 +893,9 @@ mod tests {
893893
#[test]
894894
fn test_1_element() {
895895
let mut act = Bitv::new(1u, false);
896-
assert!(act.eq_vec([false]));
896+
assert!(act.eq_vec(~[false]));
897897
act = Bitv::new(1u, true);
898-
assert!(act.eq_vec([true]));
898+
assert!(act.eq_vec(~[true]));
899899
}
900900
901901
#[test]
@@ -913,11 +913,11 @@ mod tests {
913913
914914
act = Bitv::new(10u, false);
915915
assert!((act.eq_vec(
916-
[false, false, false, false, false, false, false, false, false, false])));
916+
~[false, false, false, false, false, false, false, false, false, false])));
917917
// all 1
918918
919919
act = Bitv::new(10u, true);
920-
assert!((act.eq_vec([true, true, true, true, true, true, true, true, true, true])));
920+
assert!((act.eq_vec(~[true, true, true, true, true, true, true, true, true, true])));
921921
// mixed
922922
923923
act = Bitv::new(10u, false);
@@ -926,7 +926,7 @@ mod tests {
926926
act.set(2u, true);
927927
act.set(3u, true);
928928
act.set(4u, true);
929-
assert!((act.eq_vec([true, true, true, true, true, false, false, false, false, false])));
929+
assert!((act.eq_vec(~[true, true, true, true, true, false, false, false, false, false])));
930930
// mixed
931931
932932
act = Bitv::new(10u, false);
@@ -935,15 +935,15 @@ mod tests {
935935
act.set(7u, true);
936936
act.set(8u, true);
937937
act.set(9u, true);
938-
assert!((act.eq_vec([false, false, false, false, false, true, true, true, true, true])));
938+
assert!((act.eq_vec(~[false, false, false, false, false, true, true, true, true, true])));
939939
// mixed
940940
941941
act = Bitv::new(10u, false);
942942
act.set(0u, true);
943943
act.set(3u, true);
944944
act.set(6u, true);
945945
act.set(9u, true);
946-
assert!((act.eq_vec([true, false, false, true, false, false, true, false, false, true])));
946+
assert!((act.eq_vec(~[true, false, false, true, false, false, true, false, false, true])));
947947
}
948948
949949
#[test]
@@ -953,14 +953,14 @@ mod tests {
953953
954954
act = Bitv::new(31u, false);
955955
assert!(act.eq_vec(
956-
[false, false, false, false, false, false, false, false, false, false, false,
956+
~[false, false, false, false, false, false, false, false, false, false, false,
957957
false, false, false, false, false, false, false, false, false, false, false, false,
958958
false, false, false, false, false, false, false, false]));
959959
// all 1
960960
961961
act = Bitv::new(31u, true);
962962
assert!(act.eq_vec(
963-
[true, true, true, true, true, true, true, true, true, true, true, true, true,
963+
~[true, true, true, true, true, true, true, true, true, true, true, true, true,
964964
true, true, true, true, true, true, true, true, true, true, true, true, true, true,
965965
true, true, true, true]));
966966
// mixed
@@ -975,7 +975,7 @@ mod tests {
975975
act.set(6u, true);
976976
act.set(7u, true);
977977
assert!(act.eq_vec(
978-
[true, true, true, true, true, true, true, true, false, false, false, false, false,
978+
~[true, true, true, true, true, true, true, true, false, false, false, false, false,
979979
false, false, false, false, false, false, false, false, false, false, false, false,
980980
false, false, false, false, false, false]));
981981
// mixed
@@ -990,7 +990,7 @@ mod tests {
990990
act.set(22u, true);
991991
act.set(23u, true);
992992
assert!(act.eq_vec(
993-
[false, false, false, false, false, false, false, false, false, false, false,
993+
~[false, false, false, false, false, false, false, false, false, false, false,
994994
false, false, false, false, false, true, true, true, true, true, true, true, true,
995995
false, false, false, false, false, false, false]));
996996
// mixed
@@ -1004,7 +1004,7 @@ mod tests {
10041004
act.set(29u, true);
10051005
act.set(30u, true);
10061006
assert!(act.eq_vec(
1007-
[false, false, false, false, false, false, false, false, false, false, false,
1007+
~[false, false, false, false, false, false, false, false, false, false, false,
10081008
false, false, false, false, false, false, false, false, false, false, false, false,
10091009
false, true, true, true, true, true, true, true]));
10101010
// mixed
@@ -1014,7 +1014,7 @@ mod tests {
10141014
act.set(17u, true);
10151015
act.set(30u, true);
10161016
assert!(act.eq_vec(
1017-
[false, false, false, true, false, false, false, false, false, false, false, false,
1017+
~[false, false, false, true, false, false, false, false, false, false, false, false,
10181018
false, false, false, false, false, true, false, false, false, false, false, false,
10191019
false, false, false, false, false, false, true]));
10201020
}
@@ -1026,14 +1026,14 @@ mod tests {
10261026
10271027
act = Bitv::new(32u, false);
10281028
assert!(act.eq_vec(
1029-
[false, false, false, false, false, false, false, false, false, false, false,
1029+
~[false, false, false, false, false, false, false, false, false, false, false,
10301030
false, false, false, false, false, false, false, false, false, false, false, false,
10311031
false, false, false, false, false, false, false, false, false]));
10321032
// all 1
10331033
10341034
act = Bitv::new(32u, true);
10351035
assert!(act.eq_vec(
1036-
[true, true, true, true, true, true, true, true, true, true, true, true, true,
1036+
~[true, true, true, true, true, true, true, true, true, true, true, true, true,
10371037
true, true, true, true, true, true, true, true, true, true, true, true, true, true,
10381038
true, true, true, true, true]));
10391039
// mixed
@@ -1048,7 +1048,7 @@ mod tests {
10481048
act.set(6u, true);
10491049
act.set(7u, true);
10501050
assert!(act.eq_vec(
1051-
[true, true, true, true, true, true, true, true, false, false, false, false, false,
1051+
~[true, true, true, true, true, true, true, true, false, false, false, false, false,
10521052
false, false, false, false, false, false, false, false, false, false, false, false,
10531053
false, false, false, false, false, false, false]));
10541054
// mixed
@@ -1063,7 +1063,7 @@ mod tests {
10631063
act.set(22u, true);
10641064
act.set(23u, true);
10651065
assert!(act.eq_vec(
1066-
[false, false, false, false, false, false, false, false, false, false, false,
1066+
~[false, false, false, false, false, false, false, false, false, false, false,
10671067
false, false, false, false, false, true, true, true, true, true, true, true, true,
10681068
false, false, false, false, false, false, false, false]));
10691069
// mixed
@@ -1078,7 +1078,7 @@ mod tests {
10781078
act.set(30u, true);
10791079
act.set(31u, true);
10801080
assert!(act.eq_vec(
1081-
[false, false, false, false, false, false, false, false, false, false, false,
1081+
~[false, false, false, false, false, false, false, false, false, false, false,
10821082
false, false, false, false, false, false, false, false, false, false, false, false,
10831083
false, true, true, true, true, true, true, true, true]));
10841084
// mixed
@@ -1089,7 +1089,7 @@ mod tests {
10891089
act.set(30u, true);
10901090
act.set(31u, true);
10911091
assert!(act.eq_vec(
1092-
[false, false, false, true, false, false, false, false, false, false, false, false,
1092+
~[false, false, false, true, false, false, false, false, false, false, false, false,
10931093
false, false, false, false, false, true, false, false, false, false, false, false,
10941094
false, false, false, false, false, false, true, true]));
10951095
}
@@ -1101,14 +1101,14 @@ mod tests {
11011101
11021102
act = Bitv::new(33u, false);
11031103
assert!(act.eq_vec(
1104-
[false, false, false, false, false, false, false, false, false, false, false,
1104+
~[false, false, false, false, false, false, false, false, false, false, false,
11051105
false, false, false, false, false, false, false, false, false, false, false, false,
11061106
false, false, false, false, false, false, false, false, false, false]));
11071107
// all 1
11081108
11091109
act = Bitv::new(33u, true);
11101110
assert!(act.eq_vec(
1111-
[true, true, true, true, true, true, true, true, true, true, true, true, true,
1111+
~[true, true, true, true, true, true, true, true, true, true, true, true, true,
11121112
true, true, true, true, true, true, true, true, true, true, true, true, true, true,
11131113
true, true, true, true, true, true]));
11141114
// mixed
@@ -1123,7 +1123,7 @@ mod tests {
11231123
act.set(6u, true);
11241124
act.set(7u, true);
11251125
assert!(act.eq_vec(
1126-
[true, true, true, true, true, true, true, true, false, false, false, false, false,
1126+
~[true, true, true, true, true, true, true, true, false, false, false, false, false,
11271127
false, false, false, false, false, false, false, false, false, false, false, false,
11281128
false, false, false, false, false, false, false, false]));
11291129
// mixed
@@ -1138,7 +1138,7 @@ mod tests {
11381138
act.set(22u, true);
11391139
act.set(23u, true);
11401140
assert!(act.eq_vec(
1141-
[false, false, false, false, false, false, false, false, false, false, false,
1141+
~[false, false, false, false, false, false, false, false, false, false, false,
11421142
false, false, false, false, false, true, true, true, true, true, true, true, true,
11431143
false, false, false, false, false, false, false, false, false]));
11441144
// mixed
@@ -1153,7 +1153,7 @@ mod tests {
11531153
act.set(30u, true);
11541154
act.set(31u, true);
11551155
assert!(act.eq_vec(
1156-
[false, false, false, false, false, false, false, false, false, false, false,
1156+
~[false, false, false, false, false, false, false, false, false, false, false,
11571157
false, false, false, false, false, false, false, false, false, false, false, false,
11581158
false, true, true, true, true, true, true, true, true, false]));
11591159
// mixed
@@ -1165,7 +1165,7 @@ mod tests {
11651165
act.set(31u, true);
11661166
act.set(32u, true);
11671167
assert!(act.eq_vec(
1168-
[false, false, false, true, false, false, false, false, false, false, false, false,
1168+
~[false, false, false, true, false, false, false, false, false, false, false, false,
11691169
false, false, false, false, false, true, false, false, false, false, false, false,
11701170
false, false, false, false, false, false, true, true, true]));
11711171
}

‎trunk/src/libextra/sort.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -792,6 +792,7 @@ mod test_qsort {
792792

793793
use sort::*;
794794

795+
use std::int;
795796
use std::vec;
796797

797798
fn check_sort(v1: &mut [int], v2: &mut [int]) {

‎trunk/src/librusti/rusti.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,7 @@ pub fn main() {
546546
#[cfg(test)]
547547
mod tests {
548548
use std::io;
549+
use std::iterator::IteratorUtil;
549550
use program::Program;
550551
use super::*;
551552

‎trunk/src/libstd/hashmap.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,7 @@ pub type SetAlgebraIter<'self, T> =
863863

864864
#[cfg(test)]
865865
mod test_map {
866-
use container::{Container, Map};
866+
use container::{Container, Map, Set};
867867
use option::{None, Some};
868868
use super::*;
869869
use uint;
@@ -1104,7 +1104,7 @@ mod test_map {
11041104
#[cfg(test)]
11051105
mod test_set {
11061106
use super::*;
1107-
use container::Container;
1107+
use container::{Container, Map, Set};
11081108
use vec::ImmutableEqVector;
11091109
use uint;
11101110

‎trunk/src/libstd/os.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,6 +1742,7 @@ mod tests {
17421742
use rand;
17431743
use run;
17441744
use str::StrSlice;
1745+
use vec;
17451746
use vec::CopyableVector;
17461747
use libc::consts::os::posix88::{S_IRUSR, S_IWUSR, S_IXUSR};
17471748

‎trunk/src/libstd/ptr.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ use option::{Option, Some, None};
1616
use sys;
1717
use unstable::intrinsics;
1818
use util::swap;
19-
20-
#[cfg(not(test))] use ops::{Add,Sub};
21-
#[cfg(not(test))] use num::Int;
19+
use ops::{Add,Sub};
20+
use num::Int;
2221

2322
#[cfg(not(test))] use cmp::{Eq, Ord};
2423
use uint;
@@ -593,7 +592,7 @@ pub mod ptr_tests {
593592
}
594593

595594
let mut xs_mut = xs.clone();
596-
let m_start = to_mut_ptr(xs_mut);
595+
let mut m_start = to_mut_ptr(xs_mut);
597596
let mut m_ptr = m_start + 9u32;
598597

599598
while m_ptr >= m_start {

‎trunk/src/libstd/rand.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,6 +1078,7 @@ mod tests {
10781078
// This is to verify that the implementation of the ISAAC rng is
10791079
// correct (i.e. matches the output of the upstream implementation,
10801080
// which is in the runtime)
1081+
use vec;
10811082
use libc::size_t;
10821083

10831084
#[abi = "cdecl"]

‎trunk/src/libstd/to_str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ impl<A:ToStr> ToStr for @[A] {
181181
mod tests {
182182
use hashmap::HashMap;
183183
use hashmap::HashSet;
184-
use container::{MutableSet, MutableMap};
184+
use container::{Set, Map, MutableSet, MutableMap};
185185
#[test]
186186
fn test_simple_types() {
187187
assert_eq!(1i.to_str(), ~"1");

‎trunk/src/libstd/vec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use cast::transmute;
1616
use cast;
1717
use clone::Clone;
1818
use container::{Container, Mutable};
19-
use cmp::{Eq, TotalOrd, Ordering, Less, Equal, Greater};
19+
use cmp::{Eq, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
2020
use cmp;
2121
use iterator::*;
2222
use libc::c_void;

0 commit comments

Comments
 (0)