Skip to content

Commit 3e26dc6

Browse files
committed
Merge branch 'master' of github.com:rust-lang/regex
2 parents eb1a83a + 391f6a8 commit 3e26dc6

File tree

3 files changed

+26
-7
lines changed

3 files changed

+26
-7
lines changed

.travis.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
11
language: rust
2+
rust:
3+
- 1.0.0
4+
- beta
5+
- nightly
26
sudo: false
37
script:
48
- cargo build --verbose
59
- cargo test --verbose
6-
- cargo test --verbose --features pattern
10+
- |
11+
[ $TRAVIS_RUST_VERSION != nightly ] || (
12+
cargo test --verbose --features pattern &&
13+
cargo bench --verbose &&
14+
cargo test --manifest-path=regex_macros/Cargo.toml &&
15+
cargo bench --manifest-path=regex_macros/Cargo.toml
16+
)
717
- cargo doc
8-
- cargo bench --verbose
9-
- cargo test --verbose --manifest-path=regex_macros/Cargo.toml
10-
- cargo bench --verbose --manifest-path=regex_macros/Cargo.toml
1118
after_success: |
1219
[ $TRAVIS_BRANCH = master ] &&
1320
[ $TRAVIS_PULL_REQUEST = false ] &&
21+
[ $TRAVIS_RUST_VERSION = nightly ] &&
1422
echo '<meta http-equiv=refresh content=0;url=regex/index.html>' > target/doc/index.html &&
1523
pip install ghp-import --user $USER &&
1624
$HOME/.local/bin/ghp-import -n target/doc &&

regex_macros/tests/test_dynamic.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(test)]
1211
#![cfg_attr(feature = "pattern", feature(core))]
1312

1413
extern crate regex;
15-
extern crate test;
1614

1715
// Due to macro scoping rules, this definition only applies for the modules
1816
// defined below. Effectively, it allows us to use the same tests for both

src/lib.rs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,21 @@
1919
//! support and exhaustively lists the supported syntax. For more specific
2020
//! details on the API, please see the documentation for the `Regex` type.
2121
//!
22+
//! # Usage
23+
//!
2224
//! This crates is [on crates.io](https://crates.io/crates/regex) and can be
23-
//! used by adding `regex` to your dependencies in your projects `Cargo.toml`.
25+
//! used by adding `regex` to your dependencies in your project's `Cargo.toml`.
26+
//!
27+
//! ```toml
28+
//! [dependencies]
29+
//! regex = "0.1.8"
30+
//! ```
31+
//!
32+
//! and this to your crate root:
33+
//!
34+
//! ```rust
35+
//! extern crate regex;
36+
//! ```
2437
//!
2538
//! # First example: find a date
2639
//!

0 commit comments

Comments
 (0)