fix clippy and shellcheck issues

Author: gnzlbg

ci/android-install-ndk.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 # Copyright 2016 The Rust Project Developers. See the COPYRIGHT
 # file at the top-level directory of this distribution and at
 # http://rust-lang.org/COPYRIGHT.
@@ -11,10 +11,11 @@
 
 set -ex
 
-curl -O https://dl.google.com/android/repository/android-ndk-r15b-linux-x86_64.zip
+curl -O \
+     https://dl.google.com/android/repository/android-ndk-r15b-linux-x86_64.zip
 unzip -q android-ndk-r15b-linux-x86_64.zip
 
-case "$1" in
+case "${1}" in
   aarch64)
     arch=arm64
     ;;
@@ -24,14 +25,14 @@ case "$1" in
     ;;
 
   *)
-    arch=$1
+    arch="${1}"
     ;;
 esac;
 
 android-ndk-r15b/build/tools/make_standalone_toolchain.py \
         --unified-headers \
-        --install-dir /android/ndk-$1 \
-        --arch $arch \
+        --install-dir "/android/ndk-${1}" \
+        --arch "${arch}" \
         --api 24
 
 rm -rf ./android-ndk-r15b-linux-x86_64.zip ./android-ndk-r15b

ci/android-install-sdk.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 # Copyright 2016 The Rust Project Developers. See the COPYRIGHT
 # file at the top-level directory of this distribution and at
 # http://rust-lang.org/COPYRIGHT.
@@ -56,5 +56,5 @@ echo "yes" | \
 
 echo "no" |
     ./sdk/tools/bin/avdmanager create avd \
-        --name $1 \
+        --name "${1}" \
         --package "system-images;android-24;default;$abi"

ci/android-sysimage.sh

@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 # Copyright 2017 The Rust Project Developers. See the COPYRIGHT
 # file at the top-level directory of this distribution and at
 # http://rust-lang.org/COPYRIGHT.
@@ -13,40 +15,42 @@ set -ex
 URL=https://dl.google.com/android/repository/sys-img/android
 
 main() {
-    local arch=$1
-    local name=$2
+    local arch="${1}"
+    local name="${2}"
     local dest=/system
-    local td=$(mktemp -d)
+    local td
+    td="$(mktemp -d)"
 
     apt-get install --no-install-recommends e2tools
 
-    pushd $td
-    curl -O $URL/$name
-    unzip -q $name
+    pushd "$td"
+    curl -O "${URL}/${name}"
+    unzip -q "${name}"
 
-    local system=$(find . -name system.img)
+    local system
+    system=$(find . -name system.img)
     mkdir -p $dest/{bin,lib,lib64}
 
     # Extract android linker and libraries to /system
     # This allows android executables to be run directly (or with qemu)
-    if [ $arch = "x86_64" -o $arch = "arm64" ]; then
-        e2cp -p $system:/bin/linker64 $dest/bin/
-        e2cp -p $system:/lib64/libdl.so $dest/lib64/
-        e2cp -p $system:/lib64/libc.so $dest/lib64/
-        e2cp -p $system:/lib64/libm.so $dest/lib64/
+    if [ "${arch}" = "x86_64" ] || [ "${arch}" = "arm64" ]; then
+        e2cp -p "${system}:/bin/linker64" "${dest}/bin/"
+        e2cp -p "${system}:/lib64/libdl.so" "${dest}/lib64/"
+        e2cp -p "${system}:/lib64/libc.so" "${dest}/lib64/"
+        e2cp -p "${system}:/lib64/libm.so" "${dest}/lib64/"
     else
-        e2cp -p $system:/bin/linker $dest/bin/
-        e2cp -p $system:/lib/libdl.so $dest/lib/
-        e2cp -p $system:/lib/libc.so $dest/lib/
-        e2cp -p $system:/lib/libm.so $dest/lib/
+        e2cp -p "${system}:/bin/linker" "${dest}/bin/"
+        e2cp -p "${system}:/lib/libdl.so" "${dest}/lib/"
+        e2cp -p "${system}:/lib/libc.so" "${dest}/lib/"
+        e2cp -p "${system}:/lib/libm.so" "${dest}/lib/"
     fi
 
     # clean up
     apt-get purge --auto-remove -y e2tools
 
     popd
 
-    rm -rf $td
+    rm -rf "${td}"
 }
 
 main "${@}"

ci/dox.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Builds documentation for all target triples that we have a registered URL for
 # in liblibc. This scrapes the list of triples to document from `src/lib.rs`
@@ -13,27 +13,27 @@ dox() {
   local arch=$1
   local target=$2
 
-  echo documenting $arch
+  echo "documenting ${arch}"
 
   if [ "$CI" != "" ]; then
-    rustup target add $target || true
+    rustup target add "${target}" || true
   fi
 
-  rm -rf target/doc/$arch
-  mkdir target/doc/$arch
+  rm -rf "target/doc/${arch}"
+  mkdir "target/doc/${arch}"
 
-  cargo build --verbose --target $target --manifest-path crates/stdsimd/Cargo.toml
+  cargo build --verbose --target "${target}" --manifest-path crates/stdsimd/Cargo.toml
 
-  rustdoc --verbose --target $target \
-          -o target/doc/$arch crates/coresimd/src/lib.rs \
+  rustdoc --verbose --target "${target}" \
+          -o "target/doc/${arch}" crates/coresimd/src/lib.rs \
           --crate-name coresimd \
-          --library-path target/$target/debug/deps
-  rustdoc --verbose --target $target \
-          -o target/doc/$arch crates/stdsimd/src/lib.rs \
+          --library-path "target/${target}/debug/deps"
+  rustdoc --verbose --target "${target}" \
+          -o "target/doc/${arch}" crates/stdsimd/src/lib.rs \
           --crate-name stdsimd \
-          --library-path target/$target/debug/deps \
-          --extern cfg_if=`ls target/$target/debug/deps/libcfg_if-*.rlib` \
-          --extern libc=`ls target/$target/debug/deps/liblibc-*.rlib`
+          --library-path "target/${target}/debug/deps" \
+          --extern cfg_if="$(ls target/"${target}"/debug/deps/libcfg_if-*.rlib)" \
+          --extern libc="$(ls target/"${target}"/debug/deps/liblibc-*.rlib)"
 }
 
 dox i686 i686-unknown-linux-gnu
@@ -49,6 +49,6 @@ dox wasm32 wasm32-unknown-unknown
 # If we're on travis, not a PR, and on the right branch, publish!
 if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_BRANCH" = "master" ]; then
   pip install ghp_import --install-option="--prefix=$HOME/.local"
-  $HOME/.local/bin/ghp-import -n target/doc
-  git push -qf https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages
+  "${HOME}/.local/bin/ghp-import" -n target/doc
+  git push -qf "https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git" gh-pages
 fi

ci/run-docker.sh

@@ -1,30 +1,32 @@
+#!/usr/bin/env sh
+
 # Small script to run tests for a target (or all targets) inside all the
 # respective docker images.
 
 set -ex
 
 run() {
     echo "Building docker container for TARGET=${1}"
-    docker build -t stdsimd -f ci/docker/$1/Dockerfile ci/
+    docker build -t stdsimd -f "ci/docker/${1}/Dockerfile" ci/
     mkdir -p target
-    target=$(echo $1 | sed 's/-emulated//')
+    target=$(echo "${1}" | sed 's/-emulated//')
     echo "Running docker"
     docker run \
-      --user `id -u`:`id -g` \
+      --user "$(id -u)":"$(id -g)" \
       --rm \
       --init \
-      --volume $HOME/.cargo:/cargo-h \
+      --volume "${HOME}"/.cargo:/cargo-h \
       --env CARGO_HOME=/cargo-h \
-      --volume `rustc --print sysroot`:/rust:ro \
-      --env TARGET=$target \
+      --volume "$(rustc --print sysroot)":/rust:ro \
+      --env TARGET="${target}" \
       --env STDSIMD_TEST_EVERYTHING \
       --env STDSIMD_ASSERT_INSTR_IGNORE \
       --env STDSIMD_DISABLE_ASSERT_INSTR \
       --env NOSTD \
       --env NORUN \
       --env STDSIMD_TEST_NORUN \
-      --volume `pwd`:/checkout:ro \
-      --volume `pwd`/target:/checkout/target \
+      --volume "$(pwd)":/checkout:ro \
+      --volume "$(pwd)"/target:/checkout/target \
       --workdir /checkout \
       --privileged \
       stdsimd \
@@ -33,9 +35,9 @@ run() {
 }
 
 if [ -z "$1" ]; then
-  for d in `ls ci/docker/`; do
-    run $d
+  for d in ci/docker/*; do
+    run "${d}"
   done
 else
-  run $1
+  run "${1}"
 fi

ci/run.sh

@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 set -ex
 
-: ${TARGET?"The TARGET environment variable must be set."}
+: "${TARGET?The TARGET environment variable must be set.}"
 
 # Tests are all super fast anyway, and they fault often enough on travis that
 # having only one thread increases debuggability to be worth it.

coresimd/aarch64/neon.rs

@@ -1692,7 +1692,7 @@ mod tests {
 
     #[simd_test(enable = "neon")]
     unsafe fn test_vmaxvq_s8() {
-        #[cfg_attr(rustfmt, rustfmt_skip)]
+        #[rustfmt::skip]
         let r = vmaxvq_s8(::mem::transmute(i8x16::new(
             1, 2, 3, 4,
             -16, 6, 7, 5,
@@ -1735,7 +1735,7 @@ mod tests {
 
     #[simd_test(enable = "neon")]
     unsafe fn test_vmaxvq_u8() {
-        #[cfg_attr(rustfmt, rustfmt_skip)]
+        #[rustfmt::skip]
         let r = vmaxvq_u8(::mem::transmute(u8x16::new(
             1, 2, 3, 4,
             16, 6, 7, 5,
@@ -1796,7 +1796,7 @@ mod tests {
 
     #[simd_test(enable = "neon")]
     unsafe fn test_vminvq_s8() {
-        #[cfg_attr(rustfmt, rustfmt_skip)]
+        #[rustfmt::skip]
         let r = vminvq_s8(::mem::transmute(i8x16::new(
             1, 2, 3, 4,
             -16, 6, 7, 5,
@@ -1839,7 +1839,7 @@ mod tests {
 
     #[simd_test(enable = "neon")]
     unsafe fn test_vminvq_u8() {
-        #[cfg_attr(rustfmt, rustfmt_skip)]
+        #[rustfmt::skip]
         let r = vminvq_u8(::mem::transmute(u8x16::new(
             1, 2, 3, 4,
             16, 6, 7, 5,

coresimd/macros.rs

@@ -10,6 +10,8 @@ macro_rules! types {
         #[derive(Copy, Clone, Debug)]
         #[allow(non_camel_case_types)]
         #[repr(simd)]
+        #[cfg_attr(feature = "cargo-clippy",
+                   allow(clippy::missing_inline_in_public_items))]
         pub struct $name($($fields)*);
     )*)
 }

coresimd/mips/msa.rs

@@ -41,14 +41,14 @@ mod tests {
 
     #[simd_test(enable = "msa")]
     unsafe fn __msa_add_a_b() {
-        #[cfg_attr(rustfmt, rustfmt_skip)]
+        #[rustfmt::skip]
         let a = i8x16(
             1, 2, 3, 4,
             1, 2, 3, 4,
             1, 2, 3, 4,
             1, 2, 3, 4,
         );
-        #[cfg_attr(rustfmt, rustfmt_skip)]
+        #[rustfmt::skip]
         let b = i8x16(
             -4, -3, -2, -1,
             -4, -3, -2, -1,

coresimd/simd.rs

@@ -1,7 +1,6 @@
 //! Internal `#[repr(simd)]` types
 
-#![cfg_attr(rustfmt, rustfmt_skip)]
-
+#![rustfmt::skip]
 #![allow(non_camel_case_types)]
 
 macro_rules! simd_ty {