Skip to content

Commit 1104972

Browse files
authored
Merge pull request #2 from alecmocatta/bump
bump .travis.yml
2 parents 4c86436 + 81b7155 commit 1104972

File tree

5 files changed

+34
-31
lines changed

5 files changed

+34
-31
lines changed

.travis.yml

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
language: rust
22
rust: nightly
3-
cache:
4-
- cargo
3+
# cache:
4+
# - apt
5+
# - cargo
56
git:
6-
depth: 1
7+
depth: 10
78

89
addons:
910
apt:
@@ -12,9 +13,9 @@ addons:
1213

1314
env:
1415
global:
15-
- FMT_VERSION=nightly-2018-09-18
16-
- CLIPPY_VERSION=nightly-2018-09-18
17-
- DOCS_RS_VERSION=nightly-2018-09-18 # should be nightly-2018-06-03 but packed_simd fails https://github.com/onur/docs.rs/blob/32102ce458b34f750ef190182116d9583491a64b/Vagrantfile#L50
16+
- FMT_VERSION=nightly-2018-10-14
17+
- CLIPPY_VERSION=nightly-2018-10-14
18+
- DOCS_RS_VERSION=nightly-2018-10-14 # should be nightly-2018-06-03 but packed_simd fails https://github.com/onur/docs.rs/blob/32102ce458b34f750ef190182116d9583491a64b/Vagrantfile#L50
1819

1920
matrix:
2021
include:
@@ -58,22 +59,27 @@ before_script: |
5859
script: |
5960
( set -o errexit;set -o pipefail; set -o xtrace;set -o nounset;
6061
cargo +$FMT_VERSION fmt -- --check
61-
RUSTFLAGS="-C target-cpu=native" cargo +$CLIPPY_VERSION clippy --lib --tests -- -D warnings
62+
RUSTFLAGS="-C target-cpu=native" cargo +$CLIPPY_VERSION clippy --all-targets --all-features -- -D warnings
6263
OLD_IFS=$IFS IFS=";"; for RUSTFLAGS in $RUSTFLAGS_VARIATIONS; do ( IFS=$OLD_IFS
6364
export RUSTFLAGS
6465
for TARGET in $BUILD $RUN; do (
6566
[ \( "$TRAVIS_OS_NAME" = "osx" -o \( "$TRAVIS_OS_NAME" = "linux" -a "${DIST-}" = "precise" \) \) -a \( "$TARGET" = "x86_64-unknown-linux-musl" -o "$TARGET" = "i686-unknown-linux-musl" \) ] && RUSTFLAGS="$RUSTFLAGS -C linker=rust-lld -Z linker-flavor=ld.lld"
66-
RUSTFLAGS="$RUSTFLAGS -C target-cpu=native" cargo build --verbose --target "$TARGET" --lib --tests
67-
RUSTFLAGS="$RUSTFLAGS -C target-cpu=native" cargo build --verbose --target "$TARGET" --lib --tests --release
67+
cargo build --verbose --target "$TARGET" --all-targets --all-features
68+
RUSTFLAGS="$RUSTFLAGS -C target-cpu=native" cargo build --verbose --target "$TARGET" --all-targets --all-features --release
6869
); done
6970
for TARGET in $RUN; do (
7071
[ \( "$TRAVIS_OS_NAME" = "osx" -o \( "$TRAVIS_OS_NAME" = "linux" -a "${DIST-}" = "precise" \) \) -a \( "$TARGET" = "x86_64-unknown-linux-musl" -o "$TARGET" = "i686-unknown-linux-musl" \) ] && RUSTFLAGS="$RUSTFLAGS -C linker=rust-lld -Z linker-flavor=ld.lld"
71-
RUSTFLAGS="$RUSTFLAGS -C target-cpu=native" RUST_BACKTRACE=full cargo test --target "$TARGET"
72-
RUSTFLAGS="$RUSTFLAGS -C target-cpu=native" RUST_BACKTRACE=full cargo test --target "$TARGET" --release
72+
RUST_BACKTRACE=full cargo test --target "$TARGET" --all-features
73+
RUSTFLAGS="$RUSTFLAGS -C target-cpu=native" RUST_BACKTRACE=full cargo test --target "$TARGET" --all-features --release
74+
RUSTFLAGS="$RUSTFLAGS -C target-cpu=native" RUST_BACKTRACE=full cargo bench --target "$TARGET" --all-features
75+
[ ! -d examples ] || for example in examples/*; do example=${example##*/}; (
76+
RUST_BACKTRACE=full cargo run --target "$TARGET" --example ${example%.*} --all-features
77+
RUSTFLAGS="$RUSTFLAGS -C target-cpu=native" RUST_BACKTRACE=full cargo run --target "$TARGET" --example ${example%.*} --all-features --release
78+
); done
7379
); done
7480
); done; IFS=$OLD_IFS
7581
for TARGET in $BUILD $RUN; do
76-
cargo +$DOCS_RS_VERSION doc --no-deps --target "$TARGET" --release &>/dev/null
82+
cargo +$DOCS_RS_VERSION doc --no-deps --target "$TARGET" --all-features --release &>/dev/null
7783
done
7884
)
7985

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ A goal of this library is to enable composition of these algorithms; for example
2222
Run your application with `RUSTFLAGS="-C target-cpu=native"` to benefit from the SIMD-acceleration like so:
2323

2424
```bash
25-
RUSTFLAGS="-C target-cpu=native" cargo run --release
25+
RUSTFLAGS="-C target-cpu=native" cargo run --release
2626
```
2727

2828
See [this gist](https://gist.github.com/debasishg/8172796) for a good list of further algorithms to be implemented. Other resources are [Probabilistic data structures – Wikipedia](https://en.wikipedia.org/wiki/Category:Probabilistic_data_structures), [DataSketches – A similar Java library originating at Yahoo](https://datasketches.github.io/), and [Algebird – A similar Java library originating at Twitter](https://github.com/twitter/algebird).

src/count_min.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ where
8989
.iter()
9090
.enumerate()
9191
.map(|(k_i, &offset)| &self.counters[k_i][offset]),
92-
).unwrap();
92+
)
93+
.unwrap();
9394
lowest += value;
9495
self.counters
9596
.iter_mut()
@@ -108,7 +109,8 @@ where
108109
counters[offset] += value;
109110
&counters[offset]
110111
}),
111-
).unwrap()
112+
)
113+
.unwrap()
112114
}
113115
}
114116

@@ -138,7 +140,8 @@ where
138140
.iter()
139141
.zip(self.offsets(key))
140142
.map(|(counters, offset)| &counters[offset]),
141-
).unwrap()
143+
)
144+
.unwrap()
142145
}
143146

144147
// pub fn estimate_memory(

src/lib.rs

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,15 @@
1414
//! Run your application with `RUSTFLAGS="-C target-cpu=native"` to benefit from the SIMD-acceleration like so:
1515
//!
1616
//! ```bash
17-
//! RUSTFLAGS="-C target-cpu=native" cargo run --release
17+
//! RUSTFLAGS="-C target-cpu=native" cargo run --release
1818
//! ```
1919
//!
2020
//! See [this gist](https://gist.github.com/debasishg/8172796) for a good list of further algorithms to be implemented. Other resources are [Probabilistic data structures – Wikipedia](https://en.wikipedia.org/wiki/Category:Probabilistic_data_structures), [DataSketches – A similar Java library originating at Yahoo](https://datasketches.github.io/), and [Algebird – A similar Java library originating at Twitter](https://github.com/twitter/algebird).
2121
//!
2222
//! As these implementations are often in hot code paths, unsafe is used, albeit only when necessary to a) achieve the asymptotically optimal algorithm or b) mitigate an observed bottleneck.
2323
2424
#![doc(html_root_url = "https://docs.rs/streaming_algorithms/0.1.0")]
25-
#![feature(
26-
nll,
27-
tool_lints,
28-
non_modrs_mods,
29-
specialization,
30-
stdsimd,
31-
mmx_target_feature,
32-
convert_id
33-
)]
25+
#![feature(nll, specialization, convert_id)]
3426
#![warn(
3527
missing_copy_implementations,
3628
missing_debug_implementations,
@@ -40,10 +32,11 @@
4032
unused_import_braces,
4133
unused_qualifications,
4234
unused_results,
43-
)] // from https://github.com/rust-unofficial/patterns/blob/master/anti_patterns/deny-warnings.md
44-
#![allow(dead_code, stable_features)]
45-
#![warn(clippy::pedantic)]
35+
clippy::pedantic
36+
)]
37+
// from https://github.com/rust-unofficial/patterns/blob/master/anti_patterns/deny-warnings.md
4638
#![allow(
39+
dead_code,
4740
clippy::doc_markdown,
4841
clippy::inline_always,
4942
clippy::stutter,
@@ -54,7 +47,7 @@
5447
clippy::cast_sign_loss,
5548
clippy::cast_precision_loss,
5649
clippy::cast_lossless,
57-
clippy::float_cmp,
50+
clippy::float_cmp
5851
)]
5952

6053
extern crate twox_hash;

src/linked_list.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ impl<T> LinkedList<T> {
2828
(0..cap)
2929
.map(|_| (usize::max_value(), usize::max_value(), None))
3030
.collect::<Vec<_>>()
31-
}.into_boxed_slice();
31+
}
32+
.into_boxed_slice();
3233
let ret = Self {
3334
vec,
3435
head: usize::max_value(),

0 commit comments

Comments
 (0)