Skip to content

Commit 4c2b386

Browse files
authored
Merge branch 'master' into bump_core_arch
2 parents d4ac55c + e51dbed commit 4c2b386

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.travis.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,13 +248,17 @@ matrix:
248248
stage: tools
249249
- name: "rustfmt"
250250
install: true
251-
before_script: rustup component add rustfmt-preview
252-
script: ci/all.sh check_fmt || true
251+
script: |
252+
if rustup component add rustfmt-preview ; then
253+
ci/all.sh check_fmt || true
254+
fi
253255
stage: tools
254256
- name: "clippy"
255257
install: true
256-
before_script: rustup component add clippy-preview
257-
script: ci/all.sh clippy
258+
script: |
259+
if rustup component add clippy-preview ; then
260+
ci/all.sh clippy
261+
fi
258262
stage: tools
259263

260264
allow_failures:

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ is-it-maintained-open-issues = { repository = "rust-lang-nursery/packed_simd" }
2121
maintenance = { status = "experimental" }
2222

2323
[dependencies]
24-
cfg-if = "^0.1"
24+
cfg-if = "^0.1.6"
2525
core_arch = { version = "^0.1.4", optional = true }
2626

2727
[features]

ci/setup_benchmarks.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,3 @@ set -ex
55
# Get latest ISPC binary for the target and put it in the path
66
git clone https://github.com/gnzlbg/ispc-binaries
77
cp ispc-binaries/ispc-${TARGET} ispc
8-
9-
# Rust-bindgen requires RUSTFMT
10-
rustup component add rustfmt-preview

readme.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212

1313
* [API docs (`master` branch)][master_docs]
1414
* [Performance guide][perf_guide]
15-
* [API docs (`docs.rs`)][docs.rs]: **CURRENTLY DOWN** due to
16-
https://github.com/rust-lang-nursery/packed_simd/issues/110
15+
* [API docs (`docs.rs`)][docs.rs]
1716
* [RFC2366 `std::simd`][rfc2366]: - contains motivation, design rationale,
1817
discussion, etc.
1918

0 commit comments

Comments
 (0)