diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-01 15:49:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-01 15:49:12 +0000 |
commit | d961497afdc027cfe10ba8360185d71fc1373927 (patch) | |
tree | f87f7e61d49b74b8006a5213e456c23db4dafb70 | |
parent | e02fca6c61a9ebbee27e1e739c985777ee9f8a58 (diff) | |
parent | b9b96960c2033eeeec94d0ef3bc85196a571a7ff (diff) | |
download | libm-d961497afdc027cfe10ba8360185d71fc1373927.tar.gz |
Fix building with latest compiler. am: b9b96960c2
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libm/+/1907153
Change-Id: Idf852181e73de77cd17c4652c0065793497466a8
-rw-r--r-- | Android.bp | 17 | ||||
-rw-r--r-- | patches/test_build_fix.patch | 31 | ||||
-rw-r--r-- | src/math/pow.rs | 4 |
3 files changed, 40 insertions, 12 deletions
@@ -42,6 +42,8 @@ rust_library { name: "liblibm", host_supported: true, crate_name: "libm", + cargo_env_compat: true, + cargo_pkg_version: "0.2.1", srcs: ["src/lib.rs"], edition: "2018", features: ["default"], @@ -53,9 +55,11 @@ rust_library { } rust_defaults { - name: "libm_defaults", + name: "libm_test_defaults", crate_name: "libm", srcs: ["src/lib.rs"], + cargo_env_compat: true, + cargo_pkg_version: "0.2.1", test_suites: ["general-tests"], auto_gen_config: true, edition: "2018", @@ -65,7 +69,7 @@ rust_defaults { rust_test_host { name: "libm_host_test_src_lib", - defaults: ["libm_defaults"], + defaults: ["libm_test_defaults"], test_options: { unit_test: true, }, @@ -73,12 +77,5 @@ rust_test_host { rust_test { name: "libm_device_test_src_lib", - defaults: ["libm_defaults"], + defaults: ["libm_test_defaults"], } - -// dependent_library ["feature_list"] -// no-panic-0.1.15 -// proc-macro2-1.0.26 "default,proc-macro" -// quote-1.0.9 "default,proc-macro" -// syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote" -// unicode-xid-0.2.1 "default" diff --git a/patches/test_build_fix.patch b/patches/test_build_fix.patch new file mode 100644 index 0000000..82c3756 --- /dev/null +++ b/patches/test_build_fix.patch @@ -0,0 +1,31 @@ +From c18c704856ffa8b3349401300e66796d4cc8d4f5 Mon Sep 17 00:00:00 2001 +From: Jethro Beekman <jethro@fortanix.com> +Date: Thu, 24 Jun 2021 15:58:36 +0200 +Subject: [PATCH] Fix build failure with latest nightly + +--- + src/math/pow.rs | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/math/pow.rs b/src/math/pow.rs +index c7fd0df..f79680a 100644 +--- a/src/math/pow.rs ++++ b/src/math/pow.rs +@@ -604,7 +604,7 @@ mod tests { + + // Factoring -1 out: + // (negative anything ^ integer should be (-1 ^ integer) * (positive anything ^ integer)) +- &[POS_ZERO, NEG_ZERO, POS_ONE, NEG_ONE, POS_EVENS, NEG_EVENS] ++ (&[POS_ZERO, NEG_ZERO, POS_ONE, NEG_ONE, POS_EVENS, NEG_EVENS]) + .iter() + .for_each(|int_set| { + int_set.iter().for_each(|int| { +@@ -616,7 +616,7 @@ mod tests { + + // Negative base (imaginary results): + // (-anything except 0 and Infinity ^ non-integer should be NAN) +- &NEG[1..(NEG.len() - 1)].iter().for_each(|set| { ++ (&NEG[1..(NEG.len() - 1)]).iter().for_each(|set| { + set.iter().for_each(|val| { + test_sets(&ALL[3..7], &|v: f64| pow(*val, v), &|_| NAN); + }) diff --git a/src/math/pow.rs b/src/math/pow.rs index ce8e83e..8b5989c 100644 --- a/src/math/pow.rs +++ b/src/math/pow.rs @@ -604,7 +604,7 @@ mod tests { // Factoring -1 out: // (negative anything ^ integer should be (-1 ^ integer) * (positive anything ^ integer)) - &[POS_ZERO, NEG_ZERO, POS_ONE, NEG_ONE, POS_EVENS, NEG_EVENS] + (&[POS_ZERO, NEG_ZERO, POS_ONE, NEG_ONE, POS_EVENS, NEG_EVENS]) .iter() .for_each(|int_set| { int_set.iter().for_each(|int| { @@ -616,7 +616,7 @@ mod tests { // Negative base (imaginary results): // (-anything except 0 and Infinity ^ non-integer should be NAN) - &NEG[1..(NEG.len() - 1)].iter().for_each(|set| { + (&NEG[1..(NEG.len() - 1)]).iter().for_each(|set| { set.iter().for_each(|val| { test_sets(&ALL[3..7], &|v: f64| pow(*val, v), &|_| NAN); }) |