Merge branch 'master' of github.com:rust-lang/regex

Author: BurntSushi

.travis.yml

@@ -1,16 +1,24 @@
 language: rust
+rust:
+  - 1.0.0
+  - beta
+  - nightly
 sudo: false
 script:
   - cargo build --verbose
   - cargo test --verbose
-  - cargo test --verbose --features pattern
+  - |
+    [ $TRAVIS_RUST_VERSION != nightly ] || (
+      cargo test --verbose --features pattern &&
+      cargo bench --verbose &&
+      cargo test --manifest-path=regex_macros/Cargo.toml &&
+      cargo bench --manifest-path=regex_macros/Cargo.toml
+    )
   - cargo doc
-  - cargo bench --verbose
-  - cargo test --verbose --manifest-path=regex_macros/Cargo.toml
-  - cargo bench --verbose --manifest-path=regex_macros/Cargo.toml
 after_success: |
   [ $TRAVIS_BRANCH = master ] &&
   [ $TRAVIS_PULL_REQUEST = false ] &&
+  [ $TRAVIS_RUST_VERSION = nightly ] &&
   echo '<meta http-equiv=refresh content=0;url=regex/index.html>' > target/doc/index.html &&
   pip install ghp-import --user $USER &&
   $HOME/.local/bin/ghp-import -n target/doc &&

regex_macros/tests/test_dynamic.rs

@@ -8,11 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(test)]
 #![cfg_attr(feature = "pattern", feature(core))]
 
 extern crate regex;
-extern crate test;
 
 // Due to macro scoping rules, this definition only applies for the modules
 // defined below. Effectively, it allows us to use the same tests for both

src/lib.rs

@@ -19,8 +19,21 @@
 //! support and exhaustively lists the supported syntax. For more specific
 //! details on the API, please see the documentation for the `Regex` type.
 //!
+//! # Usage
+//! 
 //! This crates is [on crates.io](https://crates.io/crates/regex) and can be
-//! used by adding `regex` to your dependencies in your projects `Cargo.toml`.
+//! used by adding `regex` to your dependencies in your project's `Cargo.toml`.
+//! 
+//! ```toml
+//! [dependencies]
+//! regex = "0.1.8"
+//! ```
+//! 
+//! and this to your crate root:
+//! 
+//! ```rust
+//! extern crate regex;
+//! ```
 //!
 //! # First example: find a date
 //!