From 6343535eb2f23416431bb8e5a00e4fd734df78ba Mon Sep 17 00:00:00 2001 From: David Peter Date: Thu, 10 May 2018 14:36:05 +0200 Subject: [PATCH] Add 32bit support (#87) * Add 32bit support, closes #84 * Remove error-chain backtrace support --- .travis.yml | 7 ++++--- Cargo.lock | 32 -------------------------------- Cargo.toml | 6 +++++- 3 files changed, 9 insertions(+), 36 deletions(-) diff --git a/.travis.yml b/.travis.yml index b3fb6cc4..b8b4b20d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,9 @@ matrix: env: - TARGET=x86_64-unknown-linux-musl - CC_x86_64_unknown_linux_musl=/usr/bin/musl-gcc + - os: linux + rust: stable + env: TARGET=i686-unknown-linux-gnu - os: osx rust: stable env: TARGET=x86_64-apple-darwin @@ -63,9 +66,7 @@ script: - cargo build --target $TARGET --verbose - cargo test --target $TARGET --verbose # Run 'bat' on its own source code and the README - # Piping to 'cat' forces the tty check to fail so that a pager is not used - - cargo run --target $TARGET -- src/main.rs | cat - - cargo run --target $TARGET -- README.md | cat + - cargo run --target $TARGET -- src/main.rs README.md --paging=never before_deploy: - bash ci/before_deploy.bash diff --git a/Cargo.lock b/Cargo.lock index 983c77b5..55a18093 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -29,27 +29,6 @@ dependencies = [ "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "backtrace" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "backtrace-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-demangle 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "backtrace-sys" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "base64" version = "0.8.0" @@ -198,9 +177,6 @@ dependencies = [ name = "error-chain" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "backtrace 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "flate2" @@ -529,11 +505,6 @@ dependencies = [ "ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rustc-demangle" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "safemem" version = "0.2.0" @@ -803,8 +774,6 @@ dependencies = [ "checksum ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6b3568b48b7cefa6b8ce125f9bb4989e52fbcc29ebea88df04cc7c5f12f70455" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" "checksum atty 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "2fc4a1aa4c24c0718a250f0681885c1af91419d242f29eb8f2ab28502d80dbd1" -"checksum backtrace 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea58cd16fd6c9d120b5bcb01d63883ae4cc7ba2aed35c1841b862a3c7ef6639" -"checksum backtrace-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "44585761d6161b0f57afc49482ab6bd067e4edef48c12a152c237eb0203f7661" "checksum base64 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c4a342b450b268e1be8036311e2c613d7f8a7ed31214dff1cc3b60852a3168d" "checksum bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bda13183df33055cbb84b847becce220d392df502ebe7a4a78d7021771ed94d0" "checksum bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c54bb8f454c567f21197eefcdbf5679d0bd99f2ddbe52e84c77061952e6789" @@ -862,7 +831,6 @@ dependencies = [ "checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" "checksum regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e" "checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" -"checksum rustc-demangle 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "76d7ba1feafada44f2d38eed812bd2489a03c0f5abb975799251518b68848649" "checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f" "checksum same-file 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cfb6eded0b06a0b512c8ddbcf04089138c9b4362c2f696f3c3d76039d68f3637" "checksum serde 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)" = "21924cc18e5281f232a17c040355fac97732b42cf019c24996a1642bcb169cdb" diff --git a/Cargo.toml b/Cargo.toml index ccb1f44d..b54e5b50 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,6 @@ version = "0.3.0" atty = "0.2.2" ansi_term = "0.10" console = "0.6" -error-chain = "0.11" directories = "0.10" lazy_static = "1.0" @@ -31,3 +30,8 @@ features = ["parsing", "yaml-load", "dump-load", "dump-create"] version = "2" default-features = false features = ["suggestions", "color", "wrap_help"] + +[dependencies.error-chain] +version = "0.11" +default-features = false +features = []