diff options
author | Chih-Hung Hsieh <chh@google.com> | 2019-10-29 11:13:00 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-10-29 11:13:00 -0700 |
commit | 935262b4f3e9c79eb76033501bf3f69f86cd54b8 (patch) | |
tree | 236cad670aa0ee2d57c2bf389554957d9e7e0a21 | |
parent | 8316e8cf412fd78d687bc4bbcb0842b054c99197 (diff) | |
parent | 58650ab31fde6055257e66f6a8ef4ea36c0f3680 (diff) | |
download | platform_external_rust_crates_byteorder-935262b4f3e9c79eb76033501bf3f69f86cd54b8.tar.gz platform_external_rust_crates_byteorder-935262b4f3e9c79eb76033501bf3f69f86cd54b8.tar.bz2 platform_external_rust_crates_byteorder-935262b4f3e9c79eb76033501bf3f69f86cd54b8.zip |
Use released byteorder-1.3.2 at crates.io am: abcf84f8da
am: 58650ab31f
Change-Id: Ic34d935c7da1b11722bb8fe985a209f0286350b5
-rw-r--r-- | .cargo_vcs_info.json | 5 | ||||
-rw-r--r-- | Android.bp | 7 | ||||
-rw-r--r-- | Cargo.toml | 52 | ||||
-rw-r--r-- | Cargo.toml.orig | 38 | ||||
-rwxr-xr-x | ci/script.sh | 45 |
5 files changed, 80 insertions, 67 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json new file mode 100644 index 0000000..e7e8b81 --- /dev/null +++ b/.cargo_vcs_info.json @@ -0,0 +1,5 @@ +{ + "git": { + "sha1": "058237661a88c2f610f280340310fce19d98d265" + } +} @@ -1,3 +1,5 @@ +// This file is generated by cargo2android.py. + rust_library_rlib { name: "libbyteorder", host_supported: true, @@ -5,7 +7,10 @@ rust_library_rlib { srcs: ["src/lib.rs"], edition: "2015", features: [ + "default", "std", - "i128", + ], + flags: [ + "--cfg byteorder_i128", ], } @@ -1,38 +1,48 @@ +# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO +# +# When uploading crates to the registry Cargo will automatically +# "normalize" Cargo.toml files for maximal compatibility +# with all versions of Cargo and also rewrite `path` dependencies +# to registry (e.g., crates.io) dependencies +# +# If you believe there's an error in this file please file an +# issue against the rust-lang/cargo repository. If you're +# editing this file be aware that the upstream Cargo.toml +# will likely look very different (and much more reasonable) + [package] name = "byteorder" -version = "1.3.2" #:version +version = "1.3.2" authors = ["Andrew Gallant <jamslam@gmail.com>"] +build = "build.rs" +exclude = ["/ci/*"] description = "Library for reading/writing numbers in big-endian and little-endian." -documentation = "https://docs.rs/byteorder" homepage = "https://github.com/BurntSushi/byteorder" -repository = "https://github.com/BurntSushi/byteorder" +documentation = "https://docs.rs/byteorder" readme = "README.md" -categories = ["encoding", "parsing"] keywords = ["byte", "endian", "big-endian", "little-endian", "binary"] +categories = ["encoding", "parsing"] license = "Unlicense OR MIT" -exclude = ["/ci/*"] -build = "build.rs" +repository = "https://github.com/BurntSushi/byteorder" +[profile.bench] +opt-level = 3 [lib] name = "byteorder" bench = false +[dev-dependencies.doc-comment] +version = "0.3" + +[dev-dependencies.quickcheck] +version = "0.8" +default-features = false -[dev-dependencies] -quickcheck = { version = "0.8", default-features = false } -rand = "0.6" -doc-comment = "0.3" +[dev-dependencies.rand] +version = "0.6" [features] default = ["std"] -std = [] - -# This feature is no longer used and is DEPRECATED. This crate now -# automatically enables i128 support for Rust compilers that support it. The -# feature will be removed if and when a new major version is released. i128 = [] - -[profile.bench] -opt-level = 3 - -[badges] -travis-ci = { repository = "BurntSushi/byteorder" } +std = [] +[badges.travis-ci] +repository = "BurntSushi/byteorder" diff --git a/Cargo.toml.orig b/Cargo.toml.orig new file mode 100644 index 0000000..91f2aa3 --- /dev/null +++ b/Cargo.toml.orig @@ -0,0 +1,38 @@ +[package] +name = "byteorder" +version = "1.3.2" #:version +authors = ["Andrew Gallant <jamslam@gmail.com>"] +description = "Library for reading/writing numbers in big-endian and little-endian." +documentation = "https://docs.rs/byteorder" +homepage = "https://github.com/BurntSushi/byteorder" +repository = "https://github.com/BurntSushi/byteorder" +readme = "README.md" +categories = ["encoding", "parsing"] +keywords = ["byte", "endian", "big-endian", "little-endian", "binary"] +license = "Unlicense OR MIT" +exclude = ["/ci/*"] +build = "build.rs" + +[lib] +name = "byteorder" +bench = false + +[dev-dependencies] +quickcheck = { version = "0.8", default-features = false } +rand = "0.6" +doc-comment = "0.3" + +[features] +default = ["std"] +std = [] + +# This feature is no longer used and is DEPRECATED. This crate now +# automatically enables i128 support for Rust compilers that support it. The +# feature will be removed if and when a new major version is released. +i128 = [] + +[profile.bench] +opt-level = 3 + +[badges] +travis-ci = { repository = "BurntSushi/byteorder" } diff --git a/ci/script.sh b/ci/script.sh deleted file mode 100755 index 596e2d5..0000000 --- a/ci/script.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - -set -ex - -# Setup some variables for executing cargo commands. -# Things are a little different if we're testing with cross. -if [ ! -z "$CROSS_TARGET" ]; then - rustup target add "$CROSS_TARGET" - cargo install cross --force - export CARGO_CMD="cross" - export TARGET_PARAM="--target $CROSS_TARGET" -else - export CARGO_CMD="cargo" - export TARGET_PARAM="" -fi - -# Test the build and docs. -"$CARGO_CMD" build --verbose $TARGET_PARAM -"$CARGO_CMD" doc --verbose $TARGET_PARAM - -# If we're testing on an older version of Rust, then only check that we -# can build the crate. This is because the dev dependencies might be updated -# more frequently, and therefore might require a newer version of Rust. -# -# This isn't ideal. It's a compromise. -if [ "$TRAVIS_RUST_VERSION" = "1.12.0" ]; then - exit -fi - -"$CARGO_CMD" test --verbose $TARGET_PARAM -"$CARGO_CMD" test --verbose --no-default-features --lib $TARGET_PARAM -if [ "$TRAVIS_RUST_VERSION" = "nightly" ]; then - "$CARGO_CMD" test \ - --verbose --features i128 $TARGET_PARAM - "$CARGO_CMD" test \ - --verbose --no-default-features --features i128 --lib $TARGET_PARAM - "$CARGO_CMD" bench \ - --verbose --no-run $TARGET_PARAM - "$CARGO_CMD" bench \ - --verbose --no-run --no-default-features $TARGET_PARAM - "$CARGO_CMD" bench \ - --verbose --no-run --features i128 $TARGET_PARAM - "$CARGO_CMD" bench \ - --verbose --no-run --no-default-features --features i128 $TARGET_PARAM -fi |