aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Huang <huangluke@google.com>2021-06-30 12:42:28 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-30 12:42:28 +0000
commitbaced042f67754546e9390ee82ea99c92bb7e2a7 (patch)
tree9c1d9c35c4e23b2238262c797d320f7dceb07639
parent9aee12178a84ba49aff371ce9bbf6d350ed923a0 (diff)
parent63555b7872d89c784ab4fb163bd6bd4a82ca2ec8 (diff)
downloadbase64-baced042f67754546e9390ee82ea99c92bb7e2a7.tar.gz
Fix the error for rustdoc build am: 7339bd1252 am: d7ab16f3ba am: 63555b7872
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/base64/+/1752280 Change-Id: I53198e3954bd4f61f0d526e965c4db13adf7293b
-rw-r--r--patches/encoder.patch13
-rw-r--r--src/write/encoder.rs2
2 files changed, 14 insertions, 1 deletions
diff --git a/patches/encoder.patch b/patches/encoder.patch
new file mode 100644
index 0000000..ac1cd73
--- /dev/null
+++ b/patches/encoder.patch
@@ -0,0 +1,13 @@
+diff --git a/src/write/encoder.rs b/src/write/encoder.rs
+index 8a48f43..4bb57eb 100644
+--- a/src/write/encoder.rs
++++ b/src/write/encoder.rs
+@@ -223,7 +223,7 @@ impl<W: Write> Write for EncoderWriter<W> {
+ /// Under non-error circumstances, this returns `Ok` with the value being the number of bytes
+ /// of `input` consumed. The value may be `0`, which interacts poorly with `write_all`, which
+ /// interprets `Ok(0)` as an error, despite it being allowed by the contract of `write`. See
+- /// https://github.com/rust-lang/rust/issues/56889 for more on that.
++ /// <https://github.com/rust-lang/rust/issues/56889> for more on that.
+ ///
+ /// If the previous call to `write` provided more (encoded) data than the delegate writer could
+ /// accept in a single call to its `write`, the remaining data is buffered. As long as buffered
diff --git a/src/write/encoder.rs b/src/write/encoder.rs
index 8a48f43..4bb57eb 100644
--- a/src/write/encoder.rs
+++ b/src/write/encoder.rs
@@ -223,7 +223,7 @@ impl<W: Write> Write for EncoderWriter<W> {
/// Under non-error circumstances, this returns `Ok` with the value being the number of bytes
/// of `input` consumed. The value may be `0`, which interacts poorly with `write_all`, which
/// interprets `Ok(0)` as an error, despite it being allowed by the contract of `write`. See
- /// https://github.com/rust-lang/rust/issues/56889 for more on that.
+ /// <https://github.com/rust-lang/rust/issues/56889> for more on that.
///
/// If the previous call to `write` provided more (encoded) data than the delegate writer could
/// accept in a single call to its `write`, the remaining data is buffered. As long as buffered