Skip to content

Commit ff76778

Browse files
thestingerthestinger
committed
---
yaml --- r: 50106 b: refs/heads/auto c: 2cbfe6d h: refs/heads/master v: v3
1 parent 838ece3 commit ff76778

File tree

97 files changed

+1444
-1127
lines changed

Some content is hidden

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

97 files changed

+1444
-1127
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 94327d00c6a5329e510ae364850fa34cd758b83c
17+
refs/heads/auto: 2cbfe6d19d2feb531b746217a6313474755bf025
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167

‎branches/auto/mk/install.mk

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,6 @@ install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_TRIPLE)_H_$(CFG_BUILD_TRIPLE))
113113
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X_$(CFG_BUILD_TRIPLE)))
114114
$(Q)$(call INSTALL,$(HB2),$(PHB),rusti$(X_$(CFG_BUILD_TRIPLE)))
115115
$(Q)$(call INSTALL,$(HB2),$(PHB),rust$(X_$(CFG_BUILD_TRIPLE)))
116-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTC_$(CFG_BUILD_TRIPLE)))
117-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTPKG_$(CFG_BUILD_TRIPLE)))
118-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTDOC_$(CFG_BUILD_TRIPLE)))
119-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTI_$(CFG_BUILD_TRIPLE)))
120-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUST_$(CFG_BUILD_TRIPLE)))
121116
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB_$(CFG_BUILD_TRIPLE)))
122117
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB_$(CFG_BUILD_TRIPLE)))
123118
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTC_GLOB_$(CFG_BUILD_TRIPLE)))
@@ -142,11 +137,6 @@ uninstall:
142137
$(Q)rm -f $(PHB)/rust$(X_$(CFG_BUILD_TRIPLE))
143138
$(Q)rm -f $(PHB)/rustdoc$(X_$(CFG_BUILD_TRIPLE))
144139
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM_$(CFG_BUILD_TRIPLE))
145-
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTPKG_$(CFG_BUILD_TRIPLE))
146-
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTC_$(CFG_BUILD_TRIPLE))
147-
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTDOC_$(CFG_BUILD_TRIPLE))
148-
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTI_$(CFG_BUILD_TRIPLE))
149-
$(Q)rm -f $(PHL)/$(CFG_LIBRUST_$(CFG_BUILD_TRIPLE))
150140
$(Q)rm -f $(PHL)/$(CFG_RUNTIME_$(CFG_BUILD_TRIPLE))
151141
$(Q)for i in \
152142
$(call HOST_LIB_FROM_HL_GLOB,$(CORELIB_GLOB_$(CFG_BUILD_TRIPLE))) \

‎branches/auto/src/libcore/char.rs

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -288,16 +288,16 @@ fn test_is_whitespace() {
288288

289289
#[test]
290290
fn test_to_digit() {
291-
fail_unless!(to_digit('0', 10u) == Some(0u));
292-
fail_unless!(to_digit('1', 2u) == Some(1u));
293-
fail_unless!(to_digit('2', 3u) == Some(2u));
294-
fail_unless!(to_digit('9', 10u) == Some(9u));
295-
fail_unless!(to_digit('a', 16u) == Some(10u));
296-
fail_unless!(to_digit('A', 16u) == Some(10u));
297-
fail_unless!(to_digit('b', 16u) == Some(11u));
298-
fail_unless!(to_digit('B', 16u) == Some(11u));
299-
fail_unless!(to_digit('z', 36u) == Some(35u));
300-
fail_unless!(to_digit('Z', 36u) == Some(35u));
291+
assert_eq!(to_digit('0', 10u), Some(0u));
292+
assert_eq!(to_digit('1', 2u), Some(1u));
293+
assert_eq!(to_digit('2', 3u), Some(2u));
294+
assert_eq!(to_digit('9', 10u), Some(9u));
295+
assert_eq!(to_digit('a', 16u), Some(10u));
296+
assert_eq!(to_digit('A', 16u), Some(10u));
297+
assert_eq!(to_digit('b', 16u), Some(11u));
298+
assert_eq!(to_digit('B', 16u), Some(11u));
299+
assert_eq!(to_digit('z', 36u), Some(35u));
300+
assert_eq!(to_digit('Z', 36u), Some(35u));
301301

302302
fail_unless!(to_digit(' ', 10u).is_none());
303303
fail_unless!(to_digit('$', 36u).is_none());
@@ -321,28 +321,28 @@ fn test_is_digit() {
321321
322322
#[test]
323323
fn test_escape_default() {
324-
fail_unless!(escape_default('\n') == ~"\\n");
325-
fail_unless!(escape_default('\r') == ~"\\r");
326-
fail_unless!(escape_default('\'') == ~"\\'");
327-
fail_unless!(escape_default('"') == ~"\\\"");
328-
fail_unless!(escape_default(' ') == ~" ");
329-
fail_unless!(escape_default('a') == ~"a");
330-
fail_unless!(escape_default('~') == ~"~");
331-
fail_unless!(escape_default('\x00') == ~"\\x00");
332-
fail_unless!(escape_default('\x1f') == ~"\\x1f");
333-
fail_unless!(escape_default('\x7f') == ~"\\x7f");
334-
fail_unless!(escape_default('\xff') == ~"\\xff");
335-
fail_unless!(escape_default('\u011b') == ~"\\u011b");
336-
fail_unless!(escape_default('\U0001d4b6') == ~"\\U0001d4b6");
324+
assert_eq!(escape_default('\n'), ~"\\n");
325+
assert_eq!(escape_default('\r'), ~"\\r");
326+
assert_eq!(escape_default('\''), ~"\\'");
327+
assert_eq!(escape_default('"'), ~"\\\"");
328+
assert_eq!(escape_default(' '), ~" ");
329+
assert_eq!(escape_default('a'), ~"a");
330+
assert_eq!(escape_default('~'), ~"~");
331+
assert_eq!(escape_default('\x00'), ~"\\x00");
332+
assert_eq!(escape_default('\x1f'), ~"\\x1f");
333+
assert_eq!(escape_default('\x7f'), ~"\\x7f");
334+
assert_eq!(escape_default('\xff'), ~"\\xff");
335+
assert_eq!(escape_default('\u011b'), ~"\\u011b");
336+
assert_eq!(escape_default('\U0001d4b6'), ~"\\U0001d4b6");
337337
}
338338
339339
340340
#[test]
341341
fn test_escape_unicode() {
342-
fail_unless!(escape_unicode('\x00') == ~"\\x00");
343-
fail_unless!(escape_unicode('\n') == ~"\\x0a");
344-
fail_unless!(escape_unicode(' ') == ~"\\x20");
345-
fail_unless!(escape_unicode('a') == ~"\\x61");
346-
fail_unless!(escape_unicode('\u011b') == ~"\\u011b");
347-
fail_unless!(escape_unicode('\U0001d4b6') == ~"\\U0001d4b6");
342+
assert_eq!(escape_unicode('\x00'), ~"\\x00");
343+
assert_eq!(escape_unicode('\n'), ~"\\x0a");
344+
assert_eq!(escape_unicode(' '), ~"\\x20");
345+
assert_eq!(escape_unicode('a'), ~"\\x61");
346+
assert_eq!(escape_unicode('\u011b'), ~"\\u011b");
347+
assert_eq!(escape_unicode('\U0001d4b6'), ~"\\U0001d4b6");
348348
}

‎branches/auto/src/libcore/cmp.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,10 @@ pub pure fn max<T:Ord>(v1: T, v2: T) -> T {
172172
mod test {
173173
#[test]
174174
fn test_int() {
175-
fail_unless!(5.cmp(&10) == Less);
176-
fail_unless!(10.cmp(&5) == Greater);
177-
fail_unless!(5.cmp(&5) == Equal);
178-
fail_unless!((-5).cmp(&12) == Less);
179-
fail_unless!(12.cmp(-5) == Greater);
175+
assert_eq!(5.cmp(&10), Less);
176+
assert_eq!(10.cmp(&5), Greater);
177+
assert_eq!(5.cmp(&5), Equal);
178+
assert_eq!((-5).cmp(&12), Less);
179+
assert_eq!(12.cmp(-5), Greater);
180180
}
181181
}

‎branches/auto/src/libcore/condition.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ struct Guard<T, U> {
8484
cond: &'self Condition/&self<T, U>
8585
}
8686

87-
#[unsafe_destructor]
8887
impl<T, U> Drop for Guard/&self<T, U> {
8988
fn finalize(&self) {
9089
unsafe {

0 commit comments

Comments
 (0)