diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-15 21:44:35 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-15 21:44:35 +0000 |
commit | bf2d1b60a4bebeb56f9d20ca8fa319087162c5be (patch) | |
tree | 3ec477d7b01067633da10d4b2a1808b463f2e281 | |
parent | 08116d09639ad20891bd149b58442824a3784cd5 (diff) | |
parent | bd0bc7be90d05d9978bfbd09c10cfb88f014cd55 (diff) | |
download | matches-aml_tz3_314012010.tar.gz |
Snap for 8730993 from bd0bc7be90d05d9978bfbd09c10cfb88f014cd55 to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010
Change-Id: I582de511063673fb4cd5fb002806421b891eaebc
-rw-r--r-- | Android.bp | 50 | ||||
-rw-r--r-- | Cargo.toml | 4 | ||||
-rw-r--r-- | Cargo.toml.orig | 2 | ||||
-rw-r--r-- | METADATA | 10 | ||||
-rw-r--r-- | TEST_MAPPING | 32 | ||||
-rw-r--r-- | lib.rs | 5 | ||||
-rw-r--r-- | patches/std.diff | 13 | ||||
-rw-r--r-- | tests/use_star.rs | 10 |
8 files changed, 36 insertions, 90 deletions
@@ -23,8 +23,6 @@ rust_library { // has rustc warnings host_supported: true, crate_name: "matches", - cargo_env_compat: true, - cargo_pkg_version: "0.1.9", srcs: ["lib.rs"], edition: "2015", apex_available: [ @@ -34,27 +32,34 @@ rust_library { min_sdk_version: "29", } -rust_test { - name: "matches_test_lib", - // has rustc warnings - host_supported: true, +rust_defaults { + name: "matches_defaults", crate_name: "matches", - cargo_env_compat: true, - cargo_pkg_version: "0.1.9", + // has rustc warnings srcs: ["lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + edition: "2015", +} + +rust_test_host { + name: "matches_host_test_lib", + defaults: ["matches_defaults"], test_options: { unit_test: true, }, - edition: "2015", +} + +rust_test { + name: "matches_device_test_lib", + defaults: ["matches_defaults"], } rust_defaults { - name: "matches_test_defaults", - crate_name: "matches", - cargo_env_compat: true, - cargo_pkg_version: "0.1.9", + name: "matches_defaults_macro_use_one", + crate_name: "macro_use_one", + // has rustc warnings + srcs: ["tests/macro_use_one.rs"], test_suites: ["general-tests"], auto_gen_config: true, edition: "2015", @@ -63,24 +68,15 @@ rust_defaults { ], } -rust_test { - name: "matches_test_tests_macro_use_one", - defaults: ["matches_test_defaults"], - // has rustc warnings - host_supported: true, - srcs: ["tests/macro_use_one.rs"], +rust_test_host { + name: "matches_host_test_tests_macro_use_one", + defaults: ["matches_defaults_macro_use_one"], test_options: { unit_test: true, }, } rust_test { - name: "matches_test_tests_use_star", - defaults: ["matches_test_defaults"], - // has rustc warnings - host_supported: true, - srcs: ["tests/use_star.rs"], - test_options: { - unit_test: true, - }, + name: "matches_device_test_tests_macro_use_one", + defaults: ["matches_defaults_macro_use_one"], } @@ -3,7 +3,7 @@ # 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 @@ -12,7 +12,7 @@ [package] name = "matches" -version = "0.1.9" +version = "0.1.8" authors = ["Simon Sapin <simon.sapin@exyr.org>"] description = "A macro to evaluate, as a boolean, whether an expression matches a pattern." documentation = "https://docs.rs/matches/" diff --git a/Cargo.toml.orig b/Cargo.toml.orig index bf12269..afc7422 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "matches" -version = "0.1.9" +version = "0.1.8" authors = ["Simon Sapin <simon.sapin@exyr.org>"] license = "MIT" repository = "https://github.com/SimonSapin/rust-std-candidates" @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/matches/matches-0.1.9.crate" + value: "https://static.crates.io/crates/matches/matches-0.1.8.crate" } - version: "0.1.9" + version: "0.1.8" license_type: NOTICE last_upgrade_date { - year: 2021 - month: 9 - day: 23 + year: 2020 + month: 12 + day: 15 } } diff --git a/TEST_MAPPING b/TEST_MAPPING index 577d626..138b36c 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,39 +1,17 @@ -// Generated by update_crate_tests.py for tests that depend on this crate. +// Generated by cargo2android.py for tests that depend on this crate. { - "imports": [ - { - "path": "external/rust/crates/quiche" - }, - { - "path": "external/rust/crates/url" - } - ], "presubmit": [ { - "name": "doh_unit_test" - }, - { - "name": "matches_test_lib" - }, - { - "name": "matches_test_tests_macro_use_one" - }, - { - "name": "matches_test_tests_use_star" - } - ], - "presubmit-rust": [ - { - "name": "doh_unit_test" + "name": "matches_device_test_lib" }, { - "name": "matches_test_lib" + "name": "url_device_test_src_lib" }, { - "name": "matches_test_tests_macro_use_one" + "name": "unicode-bidi_device_test_src_lib" }, { - "name": "matches_test_tests_use_star" + "name": "matches_device_test_tests_macro_use_one" } ] } @@ -1,8 +1,3 @@ -#![no_std] - -// ANDROID: Use std to allow building as a dylib. -extern crate std; - /// Check if an expression matches a refutable pattern. /// /// Syntax: `matches!(` *expression* `,` *pattern* `)` diff --git a/patches/std.diff b/patches/std.diff deleted file mode 100644 index 371910c..0000000 --- a/patches/std.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib.rs b/lib.rs -index 3bcd6e2..01ccbf9 100644 ---- a/lib.rs -+++ b/lib.rs -@@ -1,5 +1,8 @@ - #![no_std] - -+// ANDROID: Use std to allow building as a dylib. -+extern crate std; -+ - /// Check if an expression matches a refutable pattern. - /// - /// Syntax: `matches!(` *expression* `,` *pattern* `)` diff --git a/tests/use_star.rs b/tests/use_star.rs deleted file mode 100644 index 58a670b..0000000 --- a/tests/use_star.rs +++ /dev/null @@ -1,10 +0,0 @@ -//! https://github.com/SimonSapin/rust-std-candidates/issues/22 - -extern crate matches; - -use matches::*; - -#[test] -fn test_assert_matches() { - assert_matches!(4, 4) -} |