Skip to content

Commit

Permalink
Switch Travis to using cargo
Browse files Browse the repository at this point in the history
  • Loading branch information
sfackler committed Jul 16, 2014
1 parent 25aeba6 commit 95f3c90
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
11 changes: 5 additions & 6 deletions .travis.yml
Expand Up @@ -3,12 +3,11 @@ env:
- secure: ffCiAwT3mkRQ57yTyTKUV4nRsnsdDuTSXbwSFpNg/AXLn6KTt35wpp2kbKTUhU4fUikpoKh30+TMiXp1vhc7XSUo/E06JyjccRIE6oXas07NcYhYd0JRlPPWKZU8q33jvFYFB7U63vY/65tGk+wlrWm7NFyqqXwGMuysd7XT1tE=
- LD_LIBRARY_PATH: /usr/local/lib
install:
- curl -O http://static.rust-lang.org/dist/rust-nightly-x86_64-unknown-linux-gnu.tar.gz
- tar xfz rust-nightly-x86_64-unknown-linux-gnu.tar.gz
- (cd rust-nightly-x86_64-unknown-linux-gnu/ && sudo ./install.sh)
before_script:
- ./configure
- curl http://www.rust-lang.org/rustup.sh | sudo sh -
script:
- make all check doc
- cd phf && cargo test
- cd phf && rustdoc -L target/test -L target/test/deps --test src/lib.rs
- rustdoc -L phf/target/test -L phf/target/test/deps phf/src/lib.rs
- rustdoc phf_mac/src/lib.rs
after_script:
- curl http://www.rust-ci.org/artifacts/put?t=$RUSTCI_TOKEN | sh
4 changes: 2 additions & 2 deletions phf/src/lib.rs
Expand Up @@ -110,7 +110,7 @@ impl<K: Hash+Eq, V> PhfMap<K, V> {

/// Like `find`, but can operate on any type that is equivalent to a key.
pub fn find_equiv<'a, T: Hash+Equiv<K>>(&'a self, key: &T)
-> Option<&'a V> {
-> Option<&'a V> {
self.get_entry(key, |k| key.equiv(k)).map(|e| {
let &(_, ref v) = e;
v
Expand All @@ -120,7 +120,7 @@ impl<K: Hash+Eq, V> PhfMap<K, V> {
/// Like `find_key`, but can operate on any type that is equivalent to a
/// key.
pub fn find_key_equiv<'a, T: Hash+Equiv<K>>(&'a self, key: &T)
-> Option<&'a K> {
-> Option<&'a K> {
self.get_entry(key, |k| key.equiv(k)).map(|e| {
let &(ref k, _) = e;
k
Expand Down

0 comments on commit 95f3c90

Please sign in to comment.