diff options
| author | Chris Wailes <chriswailes@google.com> | 2023-02-13 18:36:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-13 18:36:58 +0000 |
| commit | 947fd47ffeb1f8fa914a420c3045d21d877b0ce3 (patch) | |
| tree | 00fa591b3f665069a2d97cff640d6b033d096810 | |
| parent | c7d564c9440f6714723490b2f457d7688cdba67b (diff) | |
| parent | 3803cf6f6e85d637ead0282d0bf32e22159cc69b (diff) | |
| download | untrusted-947fd47ffeb1f8fa914a420c3045d21d877b0ce3.tar.gz | |
Update crate source to work with Rust 1.66.1 am: b6a60db484 am: 54c5fe172a am: 3803cf6f6e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/untrusted/+/2431193
Change-Id: Iba2438ac4eedff6623b1a5d9860da244540543da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | patches/lint-rename.patch | 31 | ||||
| -rw-r--r-- | src/untrusted.rs | 2 |
2 files changed, 32 insertions, 1 deletions
diff --git a/patches/lint-rename.patch b/patches/lint-rename.patch new file mode 100644 index 0000000..d28acc7 --- /dev/null +++ b/patches/lint-rename.patch @@ -0,0 +1,31 @@ +From 6f300ba0a9bc047c08c1bc63bdb831d56479815b Mon Sep 17 00:00:00 2001 +From: Chris Wailes <chriswailes@google.com> +Date: Fri, 10 Feb 2023 12:12:30 -0800 +Subject: [PATCH] Update crate source to work with Rust 1.66.1 + +This CL changes the name of a lint in an annotation to allow rustdoc to +successfully process the crate. + +Test: RUST_PREBUILT_VERSION="1.66.1" m rustdoc +Bug: 263153841 +Change-Id: If213ca89d296bb06d3bdeadb18b2c5b31ff36a2a +--- + src/untrusted.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/untrusted.rs b/src/untrusted.rs +index a9d7f7b..5071fdd 100644 +--- a/src/untrusted.rs ++++ b/src/untrusted.rs +@@ -102,7 +102,7 @@ + )] + // ANDROID: This lint is included in warnings and thus forbidden, but this version of the library + // is not compatible with it. +-#![allow(non_autolinks)] ++#![allow(rustdoc::bare_urls)] + #![no_std] + + // ANDROID: Unconditionally use std to allow building as a dylib. +-- +2.39.1.581.gbfd45094c4-goog + diff --git a/src/untrusted.rs b/src/untrusted.rs index a9d7f7b..5071fdd 100644 --- a/src/untrusted.rs +++ b/src/untrusted.rs @@ -102,7 +102,7 @@ )] // ANDROID: This lint is included in warnings and thus forbidden, but this version of the library // is not compatible with it. -#![allow(non_autolinks)] +#![allow(rustdoc::bare_urls)] #![no_std] // ANDROID: Unconditionally use std to allow building as a dylib. |