diff options
author | David LeGare <legare@google.com> | 2022-03-05 02:42:16 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-05 02:42:16 +0000 |
commit | f517c46dbb314e55c044d264212aac8e53a9f3f4 (patch) | |
tree | a1afe3b3cb6a1d4d7a42915fea2419272d51fa23 | |
parent | 52035381e69d095280993f9e0768808571bb14e3 (diff) | |
parent | 31f623aec81f7024f3dbd350848cb2f294ed6d0a (diff) | |
download | unicode-bidi-aml_tz4_332714010.tar.gz |
Update unicode-bidi to 0.3.7 am: 410bb6c4d3 am: 1b6e3ab167 am: 38d16362ca am: 31f623aec8aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_ase_331311020aml_ase_331112000aml_ase_331011020android13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-appsearch-releaseaml_tz4_332714010
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/unicode-bidi/+/2005051
Change-Id: I49290a39f73fa97049c46873f5b3c3cc0e543bef
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | .github/workflows/main.yml | 36 | ||||
-rw-r--r-- | .travis.yml | 37 | ||||
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | Cargo.toml | 11 | ||||
-rw-r--r-- | Cargo.toml.orig | 2 | ||||
-rw-r--r-- | METADATA | 10 | ||||
-rw-r--r-- | src/lib.rs | 2 |
8 files changed, 51 insertions, 53 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index 54bfe61..8b4acfd 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,5 +1,5 @@ { "git": { - "sha1": "2c89f8f02566cfaeb1266706b259c6c7c3aae8dd" + "sha1": "121c26b55190e14cac4b56fea02bb1e4420c4c00" } } diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..419cc67 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,36 @@ +name: CI + +on: + push: + branches: ['master'] + pull_request: + +jobs: + Test: + strategy: + matrix: + os: [ubuntu-latest] + rust: [1.36.0, stable, beta, nightly] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v2 + - uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: ${{ matrix.rust }} + override: true + - uses: actions-rs/cargo@v1 + with: + command: build + args: --all-targets + - uses: actions-rs/cargo@v1 + with: + command: test + - uses: actions-rs/cargo@v1 + with: + command: test + args: --features "serde" + - uses: actions-rs/cargo@v1 + with: + command: test + args: --no-default-features diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 7949019..0000000 --- a/.travis.yml +++ /dev/null @@ -1,37 +0,0 @@ -language: rust -sudo: false -os: linux -dist: trusty - -rust: - - nightly - - beta - - stable - - 1.31.0 - -matrix: - fast_finish: true - allow_failures: - - rust: nightly - -notifications: - email: - on_success: never - -env: - global: - - RUST_BACKTRACE=full - -script: - - cargo build --verbose - - cargo doc --verbose --no-deps - - - cargo test --verbose - - cargo test --verbose --features 'serde' - - cargo test --verbose --features 'with_serde' - - - test "$TRAVIS_RUST_VERSION" != "nightly" || - cargo bench --verbose --features 'bench_it' - - - test "$TRAVIS_RUST_VERSION" != "nightly" || - cargo run --verbose --features 'flame_it' --example 'flame_udhr' @@ -43,7 +43,7 @@ rust_library { host_supported: true, crate_name: "unicode_bidi", cargo_env_compat: true, - cargo_pkg_version: "0.3.6", + cargo_pkg_version: "0.3.7", srcs: ["src/lib.rs"], edition: "2018", features: [ @@ -62,7 +62,7 @@ rust_test { host_supported: true, crate_name: "unicode_bidi", cargo_env_compat: true, - cargo_pkg_version: "0.3.6", + cargo_pkg_version: "0.3.7", srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, @@ -3,17 +3,16 @@ # 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 +# 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) +# If you are reading this file be aware that the original Cargo.toml +# will likely look very different (and much more reasonable). +# See Cargo.toml.orig for the original contents. [package] edition = "2018" name = "unicode-bidi" -version = "0.3.6" +version = "0.3.7" authors = ["The Servo Project Developers"] exclude = ["benches/**", "data/**", "examples/**", "tests/**", "tools/**"] description = "Implementation of the Unicode Bidirectional Algorithm" diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 912ded6..812c27c 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "unicode-bidi" -version = "0.3.6" +version = "0.3.7" authors = ["The Servo Project Developers"] license = "MIT / Apache-2.0" description = "Implementation of the Unicode Bidirectional Algorithm" @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/unicode-bidi/unicode-bidi-0.3.6.crate" + value: "https://static.crates.io/crates/unicode-bidi/unicode-bidi-0.3.7.crate" } - version: "0.3.6" + version: "0.3.7" license_type: NOTICE last_upgrade_date { - year: 2021 - month: 9 - day: 22 + year: 2022 + month: 3 + day: 1 } } @@ -66,7 +66,7 @@ #![no_std] // We need to link to std to make doc tests work on older Rust versions -#![cfg(feature = "std")] +#[cfg(feature = "std")] extern crate std; #[macro_use] extern crate alloc; |