aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-06 00:06:25 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-06 00:06:25 +0000
commite0c60ddfe0ee62c3fac80ce503ccf00e744b28dd (patch)
treea1afe3b3cb6a1d4d7a42915fea2419272d51fa23
parentba5e125dbd19f68b57c4dae60cd611c967b2b9a5 (diff)
parent31f623aec81f7024f3dbd350848cb2f294ed6d0a (diff)
downloadunicode-bidi-android13-security-release.tar.gz
Snap for 8261343 from 31f623aec81f7024f3dbd350848cb2f294ed6d0a to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r7android-platform-13.0.0_r6android-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3android-platform-13.0.0_r2android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-platform-releaseandroid13-gsi
Change-Id: I018c98d3cbd05f0c6fbb9390e31226c308bdf957
-rw-r--r--.cargo_vcs_info.json2
-rw-r--r--.github/workflows/main.yml36
-rw-r--r--.travis.yml37
-rw-r--r--Android.bp4
-rw-r--r--Cargo.toml11
-rw-r--r--Cargo.toml.orig2
-rw-r--r--METADATA10
-rw-r--r--src/lib.rs2
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'
diff --git a/Android.bp b/Android.bp
index bd2fd22..baf5387 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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,
diff --git a/Cargo.toml b/Cargo.toml
index d64220e..91f32ba 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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"
diff --git a/METADATA b/METADATA
index 4590da0..3a9bbd9 100644
--- a/METADATA
+++ b/METADATA
@@ -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
}
}
diff --git a/src/lib.rs b/src/lib.rs
index 09bbcfb..bb318a0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -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;