Recontextualize all patches.
Everything is now in the same format and should apply without any fuzz.
Bug: http://b/339424309
Test: treehugger
Change-Id: I0b0851f45426b2cc27c2c26501b492f2468cf8fb
diff --git a/crates/ahash/patches/0001-Use-dev-urandom-instead-of-getrandom.patch b/crates/ahash/patches/0001-Use-dev-urandom-instead-of-getrandom.patch
index a46f1b7..1b7b9c3 100644
--- a/crates/ahash/patches/0001-Use-dev-urandom-instead-of-getrandom.patch
+++ b/crates/ahash/patches/0001-Use-dev-urandom-instead-of-getrandom.patch
@@ -19,11 +19,11 @@
src/random_state.rs | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
-diff --git a/src/random_state.rs b/src/random_state.rs
-index e885fa4..5b85726 100644
---- a/src/random_state.rs
-+++ b/src/random_state.rs
-@@ -48,6 +48,15 @@ pub(crate) const PI2: [u64; 4] = [
+diff --git b/src/random_state.rs a/src/random_state.rs
+index 46a39ab0..640d123c 100644
+--- b/src/random_state.rs
++++ a/src/random_state.rs
+@@ -49,6 +49,15 @@ pub(crate) const PI2: [u64; 4] = [
0x3f84_d5b5_b547_0917,
];
@@ -39,7 +39,7 @@
cfg_if::cfg_if! {
if #[cfg(all(feature = "compile-time-rng", any(test, fuzzing)))] {
#[inline]
-@@ -78,7 +87,9 @@ cfg_if::cfg_if! {
+@@ -79,7 +88,9 @@ cfg_if::cfg_if! {
SEEDS.get_or_init(|| {
let mut result: [u8; 64] = [0; 64];
diff --git a/crates/android_logger/patches/0003-Enable-embedding-android_logger-in-liblog_rust.patch b/crates/android_logger/patches/0003-Enable-embedding-android_logger-in-liblog_rust.patch
index 72f83ea..7947e34 100644
--- a/crates/android_logger/patches/0003-Enable-embedding-android_logger-in-liblog_rust.patch
+++ b/crates/android_logger/patches/0003-Enable-embedding-android_logger-in-liblog_rust.patch
@@ -27,10 +27,10 @@
src/lib.rs | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
-diff --git a/src/lib.rs b/src/lib.rs
-index c22f07e..c2a3c08 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
+diff --git b/src/lib.rs a/src/lib.rs
+index faf2779b..cfd2bb99 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
@@ -67,20 +67,35 @@
extern crate android_log_sys as log_ffi;
extern crate once_cell;
@@ -69,7 +69,7 @@
pub use env_logger::fmt::Formatter;
pub(crate) type FormatFn = Box<dyn Fn(&mut dyn fmt::Write, &Record) -> fmt::Result + Sync + Send>;
-@@ -499,6 +514,12 @@ pub fn init_once(config: Config) {
+@@ -542,6 +557,12 @@ pub fn init_once(config: Config) {
} else if let Some(level) = log_level {
log::set_max_level(level);
}
@@ -82,7 +82,7 @@
}
// FIXME: When `maybe_uninit_uninit_array ` is stabilized, use it instead of this helper
-@@ -553,6 +574,7 @@ mod tests {
+@@ -596,6 +617,7 @@ mod tests {
// Test whether the filter gets called correctly. Not meant to be exhaustive for all filter
// options, as these are handled directly by the filter itself.
diff --git a/crates/anyhow/patches/0001-Support-RUST_BACKTRACE-settings-in-test_fmt.patch b/crates/anyhow/patches/0001-Support-RUST_BACKTRACE-settings-in-test_fmt.patch
index 1b59607..55087e6 100644
--- a/crates/anyhow/patches/0001-Support-RUST_BACKTRACE-settings-in-test_fmt.patch
+++ b/crates/anyhow/patches/0001-Support-RUST_BACKTRACE-settings-in-test_fmt.patch
@@ -17,10 +17,10 @@
tests/test_fmt.rs | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
-diff --git a/tests/test_fmt.rs b/tests/test_fmt.rs
-index 9766d36..016b4b8 100644
---- a/tests/test_fmt.rs
-+++ b/tests/test_fmt.rs
+diff --git b/tests/test_fmt.rs a/tests/test_fmt.rs
+index 9766d366..016b4b8c 100644
+--- b/tests/test_fmt.rs
++++ a/tests/test_fmt.rs
@@ -68,27 +68,27 @@ Error {
#[test]
diff --git a/crates/async-stream-impl/patches/lib.diff b/crates/async-stream-impl/patches/lib.diff
index 9f60ea6..a5c1274 100644
--- a/crates/async-stream-impl/patches/lib.diff
+++ b/crates/async-stream-impl/patches/lib.diff
@@ -1,9 +1,14 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index 3d4d185..9081ecf 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
+
+---
+ src/lib.rs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index d3eab1a0..8a9561ba 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
@@ -1,3 +1,4 @@
+extern crate proc_macro;
use proc_macro::TokenStream;
- use proc_macro2::{Delimiter, Group, TokenStream as TokenStream2, TokenTree};
+ use proc_macro2::{Group, TokenStream as TokenStream2, TokenTree};
use quote::quote;
diff --git a/crates/bytes/patches/test_bytes.rs.patch b/crates/bytes/patches/test_bytes.rs.patch
index 429e7f5..18aef7d 100644
--- a/crates/bytes/patches/test_bytes.rs.patch
+++ b/crates/bytes/patches/test_bytes.rs.patch
@@ -1,7 +1,12 @@
-diff --git a/tests/test_bytes.rs b/tests/test_bytes.rs
-index f0cae99..402017b 100644
---- a/tests/test_bytes.rs
-+++ b/tests/test_bytes.rs
+
+---
+ tests/test_bytes.rs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git b/tests/test_bytes.rs a/tests/test_bytes.rs
+index 5ec60a5b..da1b0743 100644
+--- b/tests/test_bytes.rs
++++ a/tests/test_bytes.rs
@@ -288,6 +288,7 @@ fn split_to_uninitialized() {
}
diff --git a/crates/cast/patches/std.diff b/crates/cast/patches/std.diff
index 76f18e6..327d12e 100644
--- a/crates/cast/patches/std.diff
+++ b/crates/cast/patches/std.diff
@@ -1,7 +1,12 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index f1db3fc..40d3c91 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
+
+---
+ src/lib.rs | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index f1db3fce..40d3c911 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
@@ -105,6 +105,9 @@ use std::error;
#[cfg(test)]
mod test;
diff --git a/crates/cfg-if/patches/std.diff b/crates/cfg-if/patches/std.diff
index 4334b2a..017c7b7 100644
--- a/crates/cfg-if/patches/std.diff
+++ b/crates/cfg-if/patches/std.diff
@@ -1,7 +1,12 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index 52bbbe0..acea490 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
+
+---
+ src/lib.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index 52bbbe0f..485e1a77 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
@@ -28,6 +28,10 @@
#![deny(missing_docs)]
#![cfg_attr(test, deny(warnings))]
diff --git a/crates/ciborium-io/patches/std.diff b/crates/ciborium-io/patches/std.diff
index 057421f..8f7f3e8 100644
--- a/crates/ciborium-io/patches/std.diff
+++ b/crates/ciborium-io/patches/std.diff
@@ -1,13 +1,18 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index c887e19..0594e8c 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -19,5 +19,7 @@
+
+---
+ src/lib.rs | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index fef5b704..0318af79 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
+@@ -18,6 +18,8 @@
+ #![deny(missing_docs)]
#![deny(clippy::all)]
#![deny(clippy::cargo)]
--
+#[cfg(android_dylib)]
+extern crate std;
-+
+
#[cfg(feature = "alloc")]
extern crate alloc;
diff --git a/crates/const-oid/patches/std.diff b/crates/const-oid/patches/std.diff
index 1b14b33..cd31c82 100644
--- a/crates/const-oid/patches/std.diff
+++ b/crates/const-oid/patches/std.diff
@@ -1,10 +1,15 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index 7638340..01337e5 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -9,6 +9,10 @@
- #![forbid(unsafe_code, clippy::unwrap_used)]
- #![warn(missing_docs, rust_2018_idioms)]
+
+---
+ src/lib.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index 5bdef085..9e360f4d 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
+@@ -17,6 +17,10 @@
+ unused_qualifications
+ )]
+/// Local Android change: Use std to allow building as a dylib.
+#[cfg(android_dylib)]
@@ -12,3 +17,4 @@
+
#[cfg(feature = "std")]
extern crate std;
+
diff --git a/crates/coset/patches/std.diff b/crates/coset/patches/std.diff
index 244b78c..2ba99fd 100644
--- a/crates/coset/patches/std.diff
+++ b/crates/coset/patches/std.diff
@@ -1,7 +1,12 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index 4ce9c93..a800c89 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
+
+---
+ src/lib.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index 1d1eed59..5ee10f3e 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
@@ -100,6 +100,10 @@
#![deny(rustdoc::broken_intra_doc_links)]
extern crate alloc;
@@ -12,4 +17,4 @@
+
/// Re-export of the `ciborium` crate used for underlying CBOR encoding.
pub use ciborium as cbor;
-
\ No newline at end of file
+
diff --git a/crates/criterion/patches/cargo_pkg_version.patch b/crates/criterion/patches/cargo_pkg_version.patch
index dc99390..24a966d 100644
--- a/crates/criterion/patches/cargo_pkg_version.patch
+++ b/crates/criterion/patches/cargo_pkg_version.patch
@@ -1,6 +1,13 @@
---- a/src/connection.rs 2020-12-21 14:55:17.022985801 +0100
-+++ b/src/connection.rs 2020-12-21 14:55:35.150841529 +0100
-@@ -84,9 +84,9 @@
+
+---
+ src/connection.rs | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git b/src/connection.rs a/src/connection.rs
+index 53706d60..84cb8fc0 100755
+--- b/src/connection.rs
++++ a/src/connection.rs
+@@ -99,9 +99,9 @@ impl InnerConnection {
hello_buf[0..BENCHMARK_MAGIC_NUMBER.len()]
.copy_from_slice(BENCHMARK_MAGIC_NUMBER.as_bytes());
let mut i = BENCHMARK_MAGIC_NUMBER.len();
diff --git a/crates/crossbeam-utils/patches/disable_panic_tests_on_android.patch b/crates/crossbeam-utils/patches/disable_panic_tests_on_android.patch
index 3306735..d278fff 100644
--- a/crates/crossbeam-utils/patches/disable_panic_tests_on_android.patch
+++ b/crates/crossbeam-utils/patches/disable_panic_tests_on_android.patch
@@ -1,6 +1,14 @@
---- a/tests/sharded_lock.rs
-+++ b/tests/sharded_lock.rs
-@@ -46,6 +46,8 @@ fn frob() {
+
+---
+ tests/sharded_lock.rs | 14 ++++++++++++++
+ tests/thread.rs | 8 ++++++++
+ 2 files changed, 22 insertions(+)
+
+diff --git b/tests/sharded_lock.rs a/tests/sharded_lock.rs
+index 002f7f5e..8b0ae8e1 100644
+--- b/tests/sharded_lock.rs
++++ a/tests/sharded_lock.rs
+@@ -49,6 +49,8 @@ fn frob() {
}
#[test]
@@ -9,7 +17,7 @@
fn arc_poison_wr() {
let arc = Arc::new(ShardedLock::new(1));
let arc2 = arc.clone();
-@@ -58,6 +60,8 @@ fn arc_poison_wr() {
+@@ -61,6 +63,8 @@ fn arc_poison_wr() {
}
#[test]
@@ -18,7 +26,7 @@
fn arc_poison_ww() {
let arc = Arc::new(ShardedLock::new(1));
assert!(!arc.is_poisoned());
-@@ -72,6 +76,8 @@ fn arc_poison_ww() {
+@@ -75,6 +79,8 @@ fn arc_poison_ww() {
}
#[test]
@@ -27,7 +35,7 @@
fn arc_no_poison_rr() {
let arc = Arc::new(ShardedLock::new(1));
let arc2 = arc.clone();
-@@ -84,6 +90,8 @@ fn arc_no_poison_rr() {
+@@ -87,6 +93,8 @@ fn arc_no_poison_rr() {
assert_eq!(*lock, 1);
}
#[test]
@@ -36,7 +44,7 @@
fn arc_no_poison_sl() {
let arc = Arc::new(ShardedLock::new(1));
let arc2 = arc.clone();
-@@ -135,6 +143,8 @@ fn arc() {
+@@ -138,6 +146,8 @@ fn arc() {
}
#[test]
@@ -63,8 +71,10 @@
fn test_get_mut_poison() {
let m = Arc::new(ShardedLock::new(NonCopy(10)));
let m2 = m.clone();
---- a/tests/thread.rs
-+++ b/tests/thread.rs
+diff --git b/tests/thread.rs a/tests/thread.rs
+index 0dfad90b..280b73f0 100644
+--- b/tests/thread.rs
++++ a/tests/thread.rs
@@ -9,6 +9,8 @@ const THREADS: usize = 10;
const SMALL_STACK_SIZE: usize = 20;
diff --git a/crates/der/patches/std.diff b/crates/der/patches/std.diff
index 1cedb25..92a5caf 100644
--- a/crates/der/patches/std.diff
+++ b/crates/der/patches/std.diff
@@ -1,8 +1,13 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index b657ea1..f16857b 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -328,6 +328,10 @@
+
+---
+ src/lib.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index dcd5097d..0bb32c92 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
+@@ -320,6 +320,10 @@
//! [`UtcTime`]: asn1::UtcTime
//! [`Utf8StringRef`]: asn1::Utf8StringRef
diff --git a/crates/flagset/patches/std.diff b/crates/flagset/patches/std.diff
index f6ba365..f08c3e5 100644
--- a/crates/flagset/patches/std.diff
+++ b/crates/flagset/patches/std.diff
@@ -1,7 +1,12 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index 220af6b..cd5cca0 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
+
+---
+ src/lib.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index 220af6ba..cd5cca0b 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
@@ -247,6 +247,10 @@ appropriate `repr` attribute:
#![warn(clippy::all)]
#![no_std]
@@ -12,3 +17,4 @@
+
use core::fmt::{Debug, Formatter, Result};
use core::ops::*;
+
diff --git a/crates/futures-executor/patches/Cargo.toml.patch b/crates/futures-executor/patches/Cargo.toml.patch
index 2dbe263..477042a 100644
--- a/crates/futures-executor/patches/Cargo.toml.patch
+++ b/crates/futures-executor/patches/Cargo.toml.patch
@@ -1,8 +1,13 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 4b79bba..bf8fbf2 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -45,6 +45,7 @@ version = "1.8.0"
+
+---
+ Cargo.toml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git b/Cargo.toml a/Cargo.toml
+index 1f5472d0..ca63f5b5 100644
+--- b/Cargo.toml
++++ a/Cargo.toml
+@@ -46,6 +46,7 @@ version = "1.8.0"
optional = true
[dev-dependencies]
diff --git a/crates/lazy_static/patches/lib.rs.diff b/crates/lazy_static/patches/lib.rs.diff
index cb9510f..93d1ea6 100644
--- a/crates/lazy_static/patches/lib.rs.diff
+++ b/crates/lazy_static/patches/lib.rs.diff
@@ -1,7 +1,12 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index cada0dc..0d9d46e 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
+
+---
+ src/lib.rs | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index cada0dc6..0d9d46e0 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
@@ -104,12 +104,13 @@ This crate provides one cargo feature:
#[doc(hidden)]
pub mod lazy;
diff --git a/crates/libc/patches/musl_time_t.patch b/crates/libc/patches/musl_time_t.patch
index c238a17..18664d9 100644
--- a/crates/libc/patches/musl_time_t.patch
+++ b/crates/libc/patches/musl_time_t.patch
@@ -1,7 +1,12 @@
-diff --git a/src/unix/linux_like/linux/musl/mod.rs b/src/unix/linux_like/linux/musl/mod.rs
-index 70710734..929108ce 100644
---- a/src/unix/linux_like/linux/musl/mod.rs
-+++ b/src/unix/linux_like/linux/musl/mod.rs
+
+---
+ src/unix/linux_like/linux/musl/mod.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git b/src/unix/linux_like/linux/musl/mod.rs a/src/unix/linux_like/linux/musl/mod.rs
+index a4c1f708..a2e44896 100644
+--- b/src/unix/linux_like/linux/musl/mod.rs
++++ a/src/unix/linux_like/linux/musl/mod.rs
@@ -9,7 +9,7 @@ pub type clock_t = c_long;
See #1848 for more info."
)
diff --git a/crates/libc/patches/std.diff b/crates/libc/patches/std.diff
index 89e65f9..8d6db9f 100644
--- a/crates/libc/patches/std.diff
+++ b/crates/libc/patches/std.diff
@@ -1,10 +1,15 @@
-Index: libc/src/lib.rs
-===================================================================
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -30,6 +30,10 @@
- )]
- #![cfg_attr(libc_const_extern_fn, feature(const_extern_fn))]
+
+---
+ src/lib.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index 71139385..a0a0372d 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
+@@ -24,6 +24,10 @@
+ #![cfg_attr(feature = "rustc-dep-of-std", no_core)]
+ #![cfg_attr(libc_const_extern_fn_unstable, feature(const_extern_fn))]
+// ANDROID: Use std to allow building as a dylib.
+#[cfg(android_dylib)]
diff --git a/crates/libc/patches/sysconf.patch b/crates/libc/patches/sysconf.patch
index 2ecc6ad..a614d4a 100644
--- a/crates/libc/patches/sysconf.patch
+++ b/crates/libc/patches/sysconf.patch
@@ -1,7 +1,12 @@
-diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs
+
+---
+ src/unix/linux_like/android/mod.rs | 283 +++++++++++++++++++------------------
+ 1 file changed, 149 insertions(+), 134 deletions(-)
+
+diff --git b/src/unix/linux_like/android/mod.rs a/src/unix/linux_like/android/mod.rs
index 2c1c1e9b..8e5032aa 100644
---- a/src/unix/linux_like/android/mod.rs
-+++ b/src/unix/linux_like/android/mod.rs
+--- b/src/unix/linux_like/android/mod.rs
++++ a/src/unix/linux_like/android/mod.rs
@@ -1182,140 +1182,155 @@ pub const _PC_SYNC_IO: ::c_int = 19;
pub const FIONBIO: ::c_int = 0x5421;
diff --git a/crates/libc/patches/trusty.patch b/crates/libc/patches/trusty.patch
index d1591ea..e3ce913 100644
--- a/crates/libc/patches/trusty.patch
+++ b/crates/libc/patches/trusty.patch
@@ -1,3 +1,9 @@
+
+---
+ src/lib.rs | 6 ++++
+ src/trusty.rs | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 104 insertions(+)
+
diff --git b/src/lib.rs a/src/lib.rs
index dd9b9df1..a0a0372d 100644
--- b/src/lib.rs
@@ -17,7 +23,7 @@
pub use fixed_width_ints::*;
diff --git b/src/trusty.rs a/src/trusty.rs
new file mode 100644
-index 00000000..7f1c6399
+index 00000000..fcb5894a
--- /dev/null
+++ a/src/trusty.rs
@@ -0,0 +1,98 @@
diff --git a/crates/linkme/patches/std.diff b/crates/linkme/patches/std.diff
index a852d47..d0c9ae5 100644
--- a/crates/linkme/patches/std.diff
+++ b/crates/linkme/patches/std.diff
@@ -1,7 +1,12 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index 396057c..d460938 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
+
+---
+ src/lib.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index b51331a5..1a290b01 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
@@ -117,6 +117,10 @@
clippy::unused_self
)]
diff --git a/crates/log/patches/0001-Enable-default-initializing-liblog_rust-to-write-to-.patch b/crates/log/patches/0001-Enable-default-initializing-liblog_rust-to-write-to-.patch
index 0c8c38a..180c34c 100644
--- a/crates/log/patches/0001-Enable-default-initializing-liblog_rust-to-write-to-.patch
+++ b/crates/log/patches/0001-Enable-default-initializing-liblog_rust-to-write-to-.patch
@@ -24,47 +24,22 @@
Test: observe set log filter applying only to non-FFI call
Change-Id: I04dd334c66e5a2be8cfb19e87be3afb9146e5aa6
---
- Android.bp | 12 ++++++++++++
src/android_logger.rs | 1 +
src/lib.rs | 23 +++++++++++++++++++++++
- 3 files changed, 36 insertions(+)
- create mode 120000 src/android_logger.rs
+ 2 files changed, 24 insertions(+)
-diff --git a/Android.bp b/Android.bp
-index e6ff3cf..81c9175 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -60,6 +60,18 @@ rust_library {
- product_available: true,
- vendor_available: true,
- min_sdk_version: "29",
-+ target: {
-+ android: {
-+ cfgs: ["default_log_impl"],
-+ rustlibs: [
-+ "libandroid_log_sys",
-+ "libonce_cell",
-+ ],
-+ shared_libs: [
-+ "liblog",
-+ ],
-+ }
-+ }
- }
-
- rust_library_rlib {
-diff --git a/src/android_logger.rs b/src/android_logger.rs
+diff --git b/src/android_logger.rs a/src/android_logger.rs
new file mode 120000
-index 0000000..84b8625
+index 00000000..84b8625c
--- /dev/null
-+++ b/src/android_logger.rs
++++ a/src/android_logger.rs
@@ -0,0 +1 @@
+../../android_logger/src/lib.rs
\ No newline at end of file
-diff --git a/src/lib.rs b/src/lib.rs
-index 4ead826..8eb1c50 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
+diff --git b/src/lib.rs a/src/lib.rs
+index 4ead8262..8eb1c507 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
@@ -344,6 +344,11 @@ mod serde;
#[cfg(feature = "kv_unstable")]
pub mod kv;
diff --git a/crates/memoffset/patches/std.diff b/crates/memoffset/patches/std.diff
index 034f559..c3c16b5 100644
--- a/crates/memoffset/patches/std.diff
+++ b/crates/memoffset/patches/std.diff
@@ -1,21 +1,31 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 77fe68f..bc62b4a 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -10,4 +10,5 @@
+
+---
+ Cargo.toml | 1 +
+ src/lib.rs | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git b/Cargo.toml a/Cargo.toml
+index 77fe68f7..bc62b4a7 100644
+--- b/Cargo.toml
++++ a/Cargo.toml
+@@ -10,6 +10,7 @@
# See Cargo.toml.orig for the original contents.
[package]
+edition = "2018" # ANDROID: Required to build dylib in no_std.
name = "memoffset"
-diff --git a/src/lib.rs b/src/lib.rs
-index c85fb01..25b0444 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -55,5 +55,5 @@
+ version = "0.9.0"
+ authors = ["Gilad Naaman <gilad.naaman@gmail.com>"]
+diff --git b/src/lib.rs a/src/lib.rs
+index ccf182b6..8d65d9aa 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
+@@ -55,7 +55,7 @@
//! let checksum = crc16(checksum_range);
//! ```
-#![no_std]
+#![cfg_attr(not(aosp_force_use_std), no_std)]
#![cfg_attr(
+ all(feature = "unstable_const", not(stable_const)),
+ feature(const_ptr_offset_from)
diff --git a/crates/mls-rs-codec-derive/patches/add-license-files.patch b/crates/mls-rs-codec-derive/patches/add-license-files.patch
index 90dedde..f92c4a2 100644
--- a/crates/mls-rs-codec-derive/patches/add-license-files.patch
+++ b/crates/mls-rs-codec-derive/patches/add-license-files.patch
@@ -5,11 +5,17 @@
https://github.com/awslabs/mls-rs/blob/main/LICENSE-apache
https://github.com/awslabs/mls-rs/blob/main/LICENSE-mit
-diff --git a/LICENSE-apache b/LICENSE-apache
+
+---
+ LICENSE-apache | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ LICENSE-mit | 9 +++
+ 2 files changed, 185 insertions(+)
+
+diff --git b/LICENSE-apache a/LICENSE-apache
new file mode 100644
-index 0000000..831fbc5
+index 00000000..831fbc53
--- /dev/null
-+++ b/LICENSE-apache
++++ a/LICENSE-apache
@@ -0,0 +1,176 @@
+ Apache License
+ Version 2.0, January 2004
@@ -187,11 +193,11 @@
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
-diff --git a/LICENSE-mit b/LICENSE-mit
+diff --git b/LICENSE-mit a/LICENSE-mit
new file mode 100644
-index 0000000..e547c4a
+index 00000000..e547c4ae
--- /dev/null
-+++ b/LICENSE-mit
++++ a/LICENSE-mit
@@ -0,0 +1,9 @@
+MIT License
+
diff --git a/crates/mls-rs-codec/patches/add-license-files.patch b/crates/mls-rs-codec/patches/add-license-files.patch
index 90dedde..f92c4a2 100644
--- a/crates/mls-rs-codec/patches/add-license-files.patch
+++ b/crates/mls-rs-codec/patches/add-license-files.patch
@@ -5,11 +5,17 @@
https://github.com/awslabs/mls-rs/blob/main/LICENSE-apache
https://github.com/awslabs/mls-rs/blob/main/LICENSE-mit
-diff --git a/LICENSE-apache b/LICENSE-apache
+
+---
+ LICENSE-apache | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ LICENSE-mit | 9 +++
+ 2 files changed, 185 insertions(+)
+
+diff --git b/LICENSE-apache a/LICENSE-apache
new file mode 100644
-index 0000000..831fbc5
+index 00000000..831fbc53
--- /dev/null
-+++ b/LICENSE-apache
++++ a/LICENSE-apache
@@ -0,0 +1,176 @@
+ Apache License
+ Version 2.0, January 2004
@@ -187,11 +193,11 @@
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
-diff --git a/LICENSE-mit b/LICENSE-mit
+diff --git b/LICENSE-mit a/LICENSE-mit
new file mode 100644
-index 0000000..e547c4a
+index 00000000..e547c4ae
--- /dev/null
-+++ b/LICENSE-mit
++++ a/LICENSE-mit
@@ -0,0 +1,9 @@
+MIT License
+
diff --git a/crates/mls-rs-core/patches/add-license-files.patch b/crates/mls-rs-core/patches/add-license-files.patch
index 90dedde..f92c4a2 100644
--- a/crates/mls-rs-core/patches/add-license-files.patch
+++ b/crates/mls-rs-core/patches/add-license-files.patch
@@ -5,11 +5,17 @@
https://github.com/awslabs/mls-rs/blob/main/LICENSE-apache
https://github.com/awslabs/mls-rs/blob/main/LICENSE-mit
-diff --git a/LICENSE-apache b/LICENSE-apache
+
+---
+ LICENSE-apache | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ LICENSE-mit | 9 +++
+ 2 files changed, 185 insertions(+)
+
+diff --git b/LICENSE-apache a/LICENSE-apache
new file mode 100644
-index 0000000..831fbc5
+index 00000000..831fbc53
--- /dev/null
-+++ b/LICENSE-apache
++++ a/LICENSE-apache
@@ -0,0 +1,176 @@
+ Apache License
+ Version 2.0, January 2004
@@ -187,11 +193,11 @@
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
-diff --git a/LICENSE-mit b/LICENSE-mit
+diff --git b/LICENSE-mit a/LICENSE-mit
new file mode 100644
-index 0000000..e547c4a
+index 00000000..e547c4ae
--- /dev/null
-+++ b/LICENSE-mit
++++ a/LICENSE-mit
@@ -0,0 +1,9 @@
+MIT License
+
diff --git a/crates/oorandom/patches/std.diff b/crates/oorandom/patches/std.diff
index 4524081..d60d277 100644
--- a/crates/oorandom/patches/std.diff
+++ b/crates/oorandom/patches/std.diff
@@ -1,7 +1,12 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index 8196950..f77d0b1 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
+
+---
+ src/lib.rs | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index 81969500..f77d0b13 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
@@ -22,6 +22,9 @@
#![no_std]
use core::ops::Range;
diff --git a/crates/p9/patches/OWNERS.patch b/crates/p9/patches/OWNERS.patch
index 666e27c..c49e730 100644
--- a/crates/p9/patches/OWNERS.patch
+++ b/crates/p9/patches/OWNERS.patch
@@ -1,7 +1,12 @@
-diff --git a/OWNERS b/OWNERS
+
+---
+ OWNERS | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git b/OWNERS a/OWNERS
deleted file mode 100644
-index 7868b29..0000000
---- a/crates/p9/OWNERS
+index 7868b293..00000000
+--- b/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file exists so it can be passed to fuzzer_install in dev-rust/p9.
diff --git a/crates/pin-project-lite/patches/std.diff b/crates/pin-project-lite/patches/std.diff
index 1bc1240..436782a 100644
--- a/crates/pin-project-lite/patches/std.diff
+++ b/crates/pin-project-lite/patches/std.diff
@@ -1,7 +1,12 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index 6ec2021..7e46d02 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
+
+---
+ src/lib.rs | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index 6ec2021e..7e46d02c 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
@@ -137,6 +137,9 @@ pin-project supports this.
clippy::undocumented_unsafe_blocks,
)]
diff --git a/crates/pin-project/patches/std.diff b/crates/pin-project/patches/std.diff
index 562ddd1..4404a58 100644
--- a/crates/pin-project/patches/std.diff
+++ b/crates/pin-project/patches/std.diff
@@ -1,8 +1,13 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index aaa561f..016a0c7 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -81,6 +81,9 @@
+
+---
+ src/lib.rs | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index aece45e1..41080ab3 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
+@@ -119,6 +119,9 @@ see [examples] directory for more examples and generated code.
)]
#![allow(clippy::needless_doctest_main)]
@@ -11,4 +16,4 @@
+
#[doc(inline)]
pub use pin_project_internal::pin_project;
-
+ #[doc(inline)]
diff --git a/crates/pkcs1/patches/std.diff b/crates/pkcs1/patches/std.diff
index abd6960..f4aac49 100644
--- a/crates/pkcs1/patches/std.diff
+++ b/crates/pkcs1/patches/std.diff
@@ -1,10 +1,15 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index 8b51d17..edbb128 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -9,6 +9,10 @@
- #![forbid(unsafe_code, clippy::unwrap_used)]
- #![warn(missing_docs, rust_2018_idioms, unused_qualifications)]
+
+---
+ src/lib.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index 65f216d3..e389cab3 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
+@@ -15,6 +15,10 @@
+ unused_qualifications
+ )]
+/// Local Android change: Use std to allow building as a dylib.
+#[cfg(android_dylib)]
diff --git a/crates/pkcs8/patches/std.diff b/crates/pkcs8/patches/std.diff
index 6a318cb..914fc58 100644
--- a/crates/pkcs8/patches/std.diff
+++ b/crates/pkcs8/patches/std.diff
@@ -1,8 +1,13 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index 1d2dfa2..9fcae3a 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -64,6 +64,10 @@
+
+---
+ src/lib.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index 33ceef8e..53730d4c 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
+@@ -70,6 +70,10 @@
//! [PKCS#5v2 Password Based Encryption Scheme 2 (RFC 8018)]: https://tools.ietf.org/html/rfc8018#section-6.2
//! [scrypt]: https://en.wikipedia.org/wiki/Scrypt
diff --git a/crates/ppv-lite86/patches/std.diff b/crates/ppv-lite86/patches/std.diff
index cdb5b08..1e04554 100644
--- a/crates/ppv-lite86/patches/std.diff
+++ b/crates/ppv-lite86/patches/std.diff
@@ -1,7 +1,12 @@
-Index: ppv-lite86/src/lib.rs
-===================================================================
---- ppv-lite86.orig/src/lib.rs
-+++ ppv-lite86/src/lib.rs
+
+---
+ src/lib.rs | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index 638552fc..1bc27e06 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
@@ -5,6 +5,9 @@
// Machine (which is a ZST + Copy type), which can only by created unsafely or safely
// through feature detection (e.g. fn AVX2::try_get() -> Option<Machine>).
diff --git a/crates/rustversion/patches/version.diff b/crates/rustversion/patches/version.diff
index 3eb570b..f57bf7b 100644
--- a/crates/rustversion/patches/version.diff
+++ b/crates/rustversion/patches/version.diff
@@ -1,38 +1,13 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index 2e8f1b9..e826b25 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -182,7 +182,16 @@ use crate::error::Error;
- use crate::version::Version;
- use proc_macro::TokenStream;
-
--const RUSTVERSION: Version = include!(concat!(env!("OUT_DIR"), "/version.expr"));
-+// ANDROID: Soong is providing the version of rustc via an env variable.
-+const ANDROID_RUSTVERSION: Option<&str> = option_env!("ANDROID_RUST_VERSION");
-+fn rust_version() -> Version {
-+ let v: Vec<&str> = ANDROID_RUSTVERSION.unwrap().split('.').collect();
-+ Version {
-+ minor: v[1].parse().unwrap(),
-+ patch: v[2].parse().unwrap(),
-+ channel: version::Channel::Stable,
-+ }
-+}
-
- #[proc_macro_attribute]
- pub fn stable(args: TokenStream, input: TokenStream) -> TokenStream {
-@@ -239,7 +248,7 @@ pub fn cfg(input: TokenStream) -> TokenStream {
- let ref mut args = iter::new(input);
- let expr = expr::parse(args)?;
- token::parse_end(args)?;
-- let boolean = expr.eval(RUSTVERSION);
-+ let boolean = expr.eval(rust_version());
- let ident = Ident::new(&boolean.to_string(), Span::call_site());
- Ok(TokenStream::from(TokenTree::Ident(ident)))
- })()
-diff --git a/src/expand.rs b/src/expand.rs
-index 813ba85..3d4e314 100644
---- a/src/expand.rs
-+++ b/src/expand.rs
+
+---
+ src/expand.rs | 4 ++--
+ src/lib.rs | 13 +++++++++++--
+ 2 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git b/src/expand.rs a/src/expand.rs
+index 813ba85d..3d4e3148 100644
+--- b/src/expand.rs
++++ a/src/expand.rs
@@ -23,7 +23,7 @@ fn try_cfg(introducer: &str, args: TokenStream, input: TokenStream) -> Result<To
let expr = expr::parse(full_args)?;
token::parse_end(full_args)?;
@@ -51,3 +26,34 @@
return Ok(input);
}
+diff --git b/src/lib.rs a/src/lib.rs
+index 885af6e9..1bf0f1dc 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
+@@ -183,7 +183,16 @@ use crate::error::Error;
+ use crate::version::Version;
+ use proc_macro::TokenStream;
+
+-const RUSTVERSION: Version = include!(concat!(env!("OUT_DIR"), "/version.expr"));
++// ANDROID: Soong is providing the version of rustc via an env variable.
++const ANDROID_RUSTVERSION: Option<&str> = option_env!("ANDROID_RUST_VERSION");
++fn rust_version() -> Version {
++ let v: Vec<&str> = ANDROID_RUSTVERSION.unwrap().split('.').collect();
++ Version {
++ minor: v[1].parse().unwrap(),
++ patch: v[2].parse().unwrap(),
++ channel: version::Channel::Stable,
++ }
++}
+
+ #[proc_macro_attribute]
+ pub fn stable(args: TokenStream, input: TokenStream) -> TokenStream {
+@@ -240,7 +249,7 @@ pub fn cfg(input: TokenStream) -> TokenStream {
+ let ref mut args = iter::new(input);
+ let expr = expr::parse(args)?;
+ token::parse_end(args)?;
+- let boolean = expr.eval(RUSTVERSION);
++ let boolean = expr.eval(rust_version());
+ let ident = Ident::new(&boolean.to_string(), Span::call_site());
+ Ok(TokenStream::from(TokenTree::Ident(ident)))
+ })()
diff --git a/crates/scopeguard/patches/disable_panic_tests.patch b/crates/scopeguard/patches/disable_panic_tests.patch
index 97615cd..1db9447 100644
--- a/crates/scopeguard/patches/disable_panic_tests.patch
+++ b/crates/scopeguard/patches/disable_panic_tests.patch
@@ -1,8 +1,13 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index d33c2b6..39f5026 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -500,6 +500,7 @@ mod tests {
+
+---
+ src/lib.rs | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index b5522c7b..d94129f6 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
+@@ -517,6 +517,7 @@ mod tests {
#[cfg(feature = "use_std")]
#[test]
@@ -10,7 +15,7 @@
fn test_defer_success_2() {
let drops = Cell::new(0);
let _ = catch_unwind(AssertUnwindSafe(|| {
-@@ -511,6 +512,7 @@ mod tests {
+@@ -528,6 +529,7 @@ mod tests {
#[cfg(feature = "use_std")]
#[test]
diff --git a/crates/sec1/patches/std.diff b/crates/sec1/patches/std.diff
index 93800a5..779f854 100644
--- a/crates/sec1/patches/std.diff
+++ b/crates/sec1/patches/std.diff
@@ -1,8 +1,13 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index 8e01b1f..6b658b6 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -17,6 +17,10 @@
+
+---
+ src/lib.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index f6b41908..6b44d3dc 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
+@@ -23,6 +23,10 @@
//! serializers/deserializers will autodetect if a "human friendly" textual
//! encoding is being used, and if so encode the points as hexadecimal.
diff --git a/crates/slab/patches/disable_panic_tests_on_android.patch b/crates/slab/patches/disable_panic_tests_on_android.patch
index 4333952..0cdc397 100644
--- a/crates/slab/patches/disable_panic_tests_on_android.patch
+++ b/crates/slab/patches/disable_panic_tests_on_android.patch
@@ -1,8 +1,13 @@
-diff --git a/tests/slab.rs b/tests/slab.rs
-index c1570fa..8ba3064 100644
---- a/tests/slab.rs
-+++ b/tests/slab.rs
-@@ -580,6 +580,8 @@ fn compact_doesnt_move_if_closure_errors() {
+
+---
+ tests/slab.rs | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git b/tests/slab.rs a/tests/slab.rs
+index 4799c1dd..e18b40eb 100644
+--- b/tests/slab.rs
++++ a/tests/slab.rs
+@@ -614,6 +614,8 @@ fn compact_doesnt_move_if_closure_errors() {
}
#[test]
diff --git a/crates/spin/patches/disable_panic_tests.patch b/crates/spin/patches/disable_panic_tests.patch
index 52610fb..6a69953 100644
--- a/crates/spin/patches/disable_panic_tests.patch
+++ b/crates/spin/patches/disable_panic_tests.patch
@@ -1,44 +1,52 @@
-diff --git a/src/mutex/spin.rs b/src/mutex/spin.rs
-index 60be1e8..36d65fd 100644
---- a/src/mutex/spin.rs
-+++ b/src/mutex/spin.rs
-@@ -432,6 +432,7 @@ mod tests {
+
+---
+ src/mutex/spin.rs | 1 +
+ src/mutex/ticket.rs | 1 +
+ src/once.rs | 1 +
+ src/rwlock.rs | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git b/src/mutex/spin.rs a/src/mutex/spin.rs
+index fc974727..561d7650 100644
+--- b/src/mutex/spin.rs
++++ a/src/mutex/spin.rs
+@@ -499,6 +499,7 @@ mod tests {
}
#[test]
+ #[ignore = "Android uses panic_abort"]
fn test_mutex_arc_access_in_unwind() {
- let arc = Arc::new(SpinMutex::new(1));
+ let arc = Arc::new(SpinMutex::<_>::new(1));
let arc2 = arc.clone();
-diff --git a/src/mutex/ticket.rs b/src/mutex/ticket.rs
-index df36e95..4186fb8 100644
---- a/src/mutex/ticket.rs
-+++ b/src/mutex/ticket.rs
-@@ -428,6 +428,7 @@ mod tests {
+diff --git b/src/mutex/ticket.rs a/src/mutex/ticket.rs
+index c14869ef..01b905ef 100644
+--- b/src/mutex/ticket.rs
++++ a/src/mutex/ticket.rs
+@@ -493,6 +493,7 @@ mod tests {
}
#[test]
+ #[ignore = "Android uses panic_abort"]
fn test_mutex_arc_access_in_unwind() {
- let arc = Arc::new(TicketMutex::new(1));
+ let arc = Arc::new(TicketMutex::<_>::new(1));
let arc2 = arc.clone();
-diff --git a/src/once.rs b/src/once.rs
-index 5d4b451..ad60405 100644
---- a/src/once.rs
-+++ b/src/once.rs
-@@ -384,6 +384,7 @@ mod tests {
+diff --git b/src/once.rs a/src/once.rs
+index 31700dce..b4202d42 100644
+--- b/src/once.rs
++++ a/src/once.rs
+@@ -647,6 +647,7 @@ mod tests {
}
#[test]
+ #[ignore = "Android uses panic_abort"]
fn panic() {
- use ::std::panic;
+ use std::panic;
-diff --git a/src/rwlock.rs b/src/rwlock.rs
-index 5c009cf..ed50407 100644
---- a/src/rwlock.rs
-+++ b/src/rwlock.rs
-@@ -932,6 +932,7 @@ mod tests {
+diff --git b/src/rwlock.rs a/src/rwlock.rs
+index 5dd35441..beae5c10 100644
+--- b/src/rwlock.rs
++++ a/src/rwlock.rs
+@@ -1025,6 +1025,7 @@ mod tests {
}
#[test]
diff --git a/crates/spki/patches/std.diff b/crates/spki/patches/std.diff
index 7ef1d49..88f0a2e 100644
--- a/crates/spki/patches/std.diff
+++ b/crates/spki/patches/std.diff
@@ -1,8 +1,13 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index f466756..995f3bd 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -48,6 +48,10 @@ pub use crate::{
+
+---
+ src/lib.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index 6c0caa72..a8b76532 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
+@@ -54,6 +54,10 @@ pub use crate::{
};
pub use der::{self, asn1::ObjectIdentifier};
@@ -11,4 +16,5 @@
+extern crate std;
+
#[cfg(feature = "alloc")]
- pub use {crate::traits::EncodePublicKey, der::Document};
+ pub use {
+ crate::{
diff --git a/crates/sync_wrapper/patches/std.diff b/crates/sync_wrapper/patches/std.diff
index 758a120..a5a7acc 100644
--- a/crates/sync_wrapper/patches/std.diff
+++ b/crates/sync_wrapper/patches/std.diff
@@ -1,7 +1,12 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index 2800d9a..ccd8454 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
+
+---
+ src/lib.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index 2800d9a7..ccd8454a 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
@@ -20,6 +20,10 @@
#![doc(html_favicon_url = "https://developer.actyx.com/img/favicon.ico")]
#![no_std]
diff --git a/crates/try-lock/patches/std.diff b/crates/try-lock/patches/std.diff
index ed76c3e..27fc01f 100644
--- a/crates/try-lock/patches/std.diff
+++ b/crates/try-lock/patches/std.diff
@@ -1,7 +1,12 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index 2811996..4faa975 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
+
+---
+ src/lib.rs | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index 28119967..4faa975b 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
@@ -1,7 +1,8 @@
#![deny(missing_docs)]
#![deny(missing_debug_implementations)]
diff --git a/crates/unicode-bidi/patches/remove_missing_test.patch b/crates/unicode-bidi/patches/remove_missing_test.patch
index 5a69521..00a0d7c 100644
--- a/crates/unicode-bidi/patches/remove_missing_test.patch
+++ b/crates/unicode-bidi/patches/remove_missing_test.patch
@@ -1,7 +1,12 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 02ea8fa..73aff86 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
+
+---
+ Cargo.toml | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git b/Cargo.toml a/Cargo.toml
+index 29be4e5a..80f71ff6 100644
+--- b/Cargo.toml
++++ a/Cargo.toml
@@ -42,11 +42,6 @@ repository = "https://github.com/servo/unicode-bidi"
[lib]
name = "unicode_bidi"
diff --git a/crates/unicode-segmentation/patches/std.diff b/crates/unicode-segmentation/patches/std.diff
index 4ed51cb..f305471 100644
--- a/crates/unicode-segmentation/patches/std.diff
+++ b/crates/unicode-segmentation/patches/std.diff
@@ -1,9 +1,14 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index f2f2962..83f3a22 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -55,7 +55,7 @@
-
+
+---
+ src/lib.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index 809c5dca..8c27fbba 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
+@@ -56,7 +56,7 @@
+ )]
#![no_std]
-#[cfg(test)]
diff --git a/crates/unicode-width/patches/std.diff b/crates/unicode-width/patches/std.diff
index 43da129..707f123 100644
--- a/crates/unicode-width/patches/std.diff
+++ b/crates/unicode-width/patches/std.diff
@@ -1,7 +1,12 @@
-Index: unicode-width/src/lib.rs
-===================================================================
---- unicode-width.orig/src/lib.rs
-+++ unicode-width/src/lib.rs
+
+---
+ src/lib.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index fac45fc4..f2a50bf8 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
@@ -49,7 +49,7 @@
#![cfg_attr(feature = "bench", feature(test))]
#![no_std]
diff --git a/crates/x509-cert/patches/std.diff b/crates/x509-cert/patches/std.diff
index 6933bc7..da0d465 100644
--- a/crates/x509-cert/patches/std.diff
+++ b/crates/x509-cert/patches/std.diff
@@ -1,8 +1,13 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index 49d888c..651bdc7 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -13,6 +13,10 @@
+
+---
+ src/lib.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index 11ef03ca..dbf3d932 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
+@@ -15,6 +15,10 @@
unused_qualifications
)]
diff --git a/crates/zeroize/patches/std.diff b/crates/zeroize/patches/std.diff
index b6cf7dd..9ddc45d 100644
--- a/crates/zeroize/patches/std.diff
+++ b/crates/zeroize/patches/std.diff
@@ -1,7 +1,12 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index 5ee0f2c..9de75bc 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
+
+---
+ src/lib.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index 4e006578..1dd35f2e 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
@@ -235,6 +235,10 @@
//! [good cryptographic hygiene]: https://github.com/veorq/cryptocoding#clean-memory-of-secret-data
//! [`Ordering::SeqCst`]: core::sync::atomic::Ordering::SeqCst
@@ -12,3 +17,4 @@
+
#[cfg(feature = "alloc")]
extern crate alloc;
+
diff --git a/crates/zeroize_derive/patches/proc_macro.patch b/crates/zeroize_derive/patches/proc_macro.patch
index de37122..edf3ef4 100644
--- a/crates/zeroize_derive/patches/proc_macro.patch
+++ b/crates/zeroize_derive/patches/proc_macro.patch
@@ -1,7 +1,12 @@
-diff --git a/src/lib.rs b/src/lib.rs
-index 2f31fc6..d1fe77e 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
+
+---
+ src/lib.rs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git b/src/lib.rs a/src/lib.rs
+index 2f31fc65..d1fe77e8 100644
+--- b/src/lib.rs
++++ a/src/lib.rs
@@ -3,6 +3,7 @@
#![crate_type = "proc-macro"]
#![forbid(unsafe_code)]
