diff options
| -rw-r--r-- | mk/crates.mk | 2 | ||||
| -rw-r--r-- | mk/tests.mk | 4 | ||||
| -rw-r--r-- | src/libcollections/str.rs | 2 | ||||
| -rw-r--r-- | src/libregex/test/tests.rs | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/mk/crates.mk b/mk/crates.mk index 4ad16b785a4..48a5bf6caf4 100644 --- a/mk/crates.mk +++ b/mk/crates.mk @@ -52,7 +52,7 @@ TARGET_CRATES := libc std green rustuv native flate arena glob term semver \ uuid serialize sync getopts collections num test time rand \ url log regex graphviz core rlibc alloc debug rustrt \ - unicode + unicode HOST_CRATES := syntax rustc rustdoc fourcc hexfloat regex_macros fmt_macros CRATES := $(TARGET_CRATES) $(HOST_CRATES) TOOLS := compiletest rustdoc rustc diff --git a/mk/tests.mk b/mk/tests.mk index 44bedde99cc..2090f89e796 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -15,11 +15,11 @@ # The names of crates that must be tested -# libcore tests are in a separate crate +# libcore/libunicode tests are in a separate crate DEPS_coretest := $(eval $(call RUST_CRATE,coretest)) -TEST_TARGET_CRATES = $(filter-out core,$(TARGET_CRATES)) coretest +TEST_TARGET_CRATES = $(filter-out core unicode,$(TARGET_CRATES)) coretest TEST_DOC_CRATES = $(DOC_CRATES) TEST_HOST_CRATES = $(HOST_CRATES) TEST_CRATES = $(TEST_TARGET_CRATES) $(TEST_HOST_CRATES) diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs index cedb3383190..fc99c967e9f 100644 --- a/src/libcollections/str.rs +++ b/src/libcollections/str.rs @@ -972,6 +972,8 @@ mod tests { use string::String; use vec::Vec; + use unicode::UnicodeChar; + #[test] fn test_eq_slice() { assert!((eq_slice("foobar".slice(0, 3), "foo"))); diff --git a/src/libregex/test/tests.rs b/src/libregex/test/tests.rs index 35cb7c3c5b0..251ab10ad34 100644 --- a/src/libregex/test/tests.rs +++ b/src/libregex/test/tests.rs @@ -195,8 +195,8 @@ mat!(uni_case_lower, r"\p{Ll}+", "ΛΘΓΔα", Some((8, 10))) // Test the Unicode friendliness of Perl character classes. mat!(uni_perl_w, r"\w+", "dδd", Some((0, 4))) -mat!(uni_perl_w_not, r"\w+", "Ⅱ", None) -mat!(uni_perl_w_neg, r"\W+", "Ⅱ", Some((0, 3))) +mat!(uni_perl_w_not, r"\w+", "⥡", None) +mat!(uni_perl_w_neg, r"\W+", "⥡", Some((0, 3))) mat!(uni_perl_d, r"\d+", "1२३9", Some((0, 8))) mat!(uni_perl_d_not, r"\d+", "Ⅱ", None) mat!(uni_perl_d_neg, r"\D+", "Ⅱ", Some((0, 3))) |