Skip to content

Commit 1f5973c

Browse files
committed
---
yaml --- r: 42664 b: refs/heads/try c: 2d33e30 h: refs/heads/master v: v3
1 parent f7c2d37 commit 1f5973c

37 files changed

+159
-148
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
5-
refs/heads/try: e4337a9defcad3f2a65da285ab78f8ede554f379
5+
refs/heads/try: 2d33e308ac8bd4e59a54feaddf301488c215f90b
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/compiletest/compiletest.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ fn parse_config(args: ~[~str]) -> config {
7070
getopts::optopt(~"logfile"),
7171
getopts::optflag(~"jit")];
7272

73-
assert !args.is_empty();
73+
assert (vec::is_not_empty(args));
7474
let args_ = vec::tail(args);
7575
let matches =
7676
&match getopts::getopts(args_, opts) {

branches/try/src/compiletest/runtest.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ fn run_cfail_test(config: config, props: test_props, testfile: &Path) {
5959
check_correct_failure_status(procres);
6060
6161
let expected_errors = errors::load_errors(testfile);
62-
if !expected_errors.is_empty() {
63-
if !props.error_patterns.is_empty() {
62+
if vec::is_not_empty(expected_errors) {
63+
if vec::is_not_empty(props.error_patterns) {
6464
fatal(~"both error pattern and expected errors specified");
6565
}
6666
check_expected_errors(expected_errors, testfile, procres);
@@ -440,7 +440,7 @@ fn compose_and_run_compiler(
440440
args: procargs,
441441
input: Option<~str>) -> procres {
442442

443-
if !props.aux_builds.is_empty() {
443+
if props.aux_builds.is_not_empty() {
444444
ensure_dir(&aux_output_dir_name(config, testfile));
445445
}
446446

branches/try/src/libcore/core.rc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,7 @@ pub use path::PosixPath;
190190

191191
pub use tuple::{CopyableTuple, ImmutableTuple, ExtendedTupleOps};
192192
pub use str::{StrSlice, Trimmable};
193-
pub use container::{Container, Mutable};
194-
pub use vec::{CopyableVector, ImmutableVector};
193+
pub use vec::{ConstVector, CopyableVector, ImmutableVector};
195194
pub use vec::{ImmutableEqVector, ImmutableCopyableVector};
196195
pub use vec::{OwnedVector, OwnedCopyableVector};
197196
pub use iter::{BaseIter, ExtendedIter, EqIter, CopyableIter};

branches/try/src/libcore/dlist.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ impl<T> DList<T> {
208208
pure fn len(@self) -> uint { self.size }
209209
/// Returns true if the list is empty. O(1).
210210
pure fn is_empty(@self) -> bool { self.len() == 0 }
211+
/// Returns true if the list is not empty. O(1).
212+
pure fn is_not_empty(@self) -> bool { self.len() != 0 }
211213
212214
/// Add data to the head of the list. O(1).
213215
fn push_head(@self, data: T) {
@@ -646,6 +648,8 @@ mod tests {
646648
let full1 = from_vec(~[1,2,3]);
647649
assert empty.is_empty();
648650
assert !full1.is_empty();
651+
assert !empty.is_not_empty();
652+
assert full1.is_not_empty();
649653
}
650654
#[test]
651655
fn test_dlist_head_tail() {

branches/try/src/libcore/float.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ pub pure fn to_str_common(num: float, digits: uint, exact: bool) -> ~str {
157157

158158
// turn digits into string
159159
// using stack of digits
160-
while !fractionalParts.is_empty() {
160+
while fractionalParts.is_not_empty() {
161161
// Bleh; shouldn't need to be unsafe
162162
let mut adjusted_digit = carry + unsafe { fractionalParts.pop() };
163163

0 commit comments

Comments
 (0)