Run test (just not benchmarks) on stable Rust.

Author: SimonSapin

.travis.yml

@@ -6,8 +6,8 @@ rust:
 script:
   - cargo build
   - cargo doc
-  - "if [ $TRAVIS_RUST_VERSION = nightly ]; then cargo test; fi"
-  - "if [ $TRAVIS_RUST_VERSION = nightly ]; then (cd capi/ctest; ./build-and-test.sh); fi"
+  - cargo test
+  - "(cd capi/ctest; ./build-and-test.sh)"
 after_success: curl https://raw.githubusercontent.com/kmcallister/travis-doc-upload/master/travis-doc-upload.sh | sh
 notifications:
   webhooks: http://build.servo.org:54856/travis

examples/fuzz.rs

@@ -6,7 +6,6 @@
 
 //! A simple fuzz tester for the library.
 
-#![feature(unsafe_no_drop_flag, str_char)]
 #![deny(warnings)]
 
 extern crate rand;
@@ -106,7 +105,7 @@ fn fuzz() {
 fn random_boundary<R: Rng>(rng: &mut R, text: &str) -> usize {
     loop {
         let i = Range::new(0, text.len()+1).ind_sample(rng);
-        if text.is_char_boundary(i) {
+        if is_char_boundary(text, i) {
             return i;
         }
     }
@@ -116,16 +115,25 @@ fn random_slice<R: Rng>(rng: &mut R, text: &str) -> (usize, usize) {
     loop {
         let start = Range::new(0, text.len()+1).ind_sample(rng);
         let end = Range::new(start, text.len()+1).ind_sample(rng);
-        if !text.is_char_boundary(start) {
+        if !is_char_boundary(text, start) {
             continue;
         }
-        if end < text.len() && !text.is_char_boundary(end) {
+        if end < text.len() && !is_char_boundary(text, end) {
             continue;
         }
         return (start, end);
     }
 }
 
+// Copy of the str::is_char_boundary method, which is unstable.
+fn is_char_boundary(s: &str, index: usize) -> bool {
+    if index == s.len() { return true; }
+    match s.as_bytes().get(index) {
+        None => false,
+        Some(&b) => b < 128 || b >= 192,
+    }
+}
+
 static TEXT: &'static str =
     "It was from the artists and poets that the pertinent answers came, and I \
      know that panic would have broken loose had they been able to compare notes. \

src/lib.rs

@@ -5,15 +5,15 @@
 // except according to those terms.
 
 #![cfg_attr(feature = "unstable", feature(core, nonzero, unsafe_no_drop_flag, filling_drop))]
-#![cfg_attr(test, feature(test, str_char))]
+#![cfg_attr(all(test, feature = "unstable"), feature(test, str_char))]
 #![cfg_attr(test, deny(warnings))]
 
 #[cfg(feature = "unstable")] extern crate core;
 #[macro_use] extern crate mac;
 extern crate futf;
 extern crate encoding;
 
-#[cfg(test)]
+#[cfg(all(test, feature = "unstable"))]
 extern crate test;
 
 pub use tendril::{Tendril, ByteTendril, StrTendril, SliceExt, ReadExt, SubtendrilError};

src/tendril.rs

@@ -1155,7 +1155,7 @@ impl<'a> From<&'a Tendril<fmt::UTF8>> for String {
 }
 
 
-#[cfg(test)]
+#[cfg(all(test, feature = "unstable"))]
 #[path="bench.rs"]
 mod bench;