From 9835e2ae736235810b4ea1c162ca5e65c547e770 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 18 May 2024 04:49:50 +0200 Subject: Merging upstream version 1.71.1+dfsg1. Signed-off-by: Daniel Baumann --- vendor/yoke/.cargo-checksum.json | 2 +- vendor/yoke/Cargo.toml | 6 +++--- vendor/yoke/src/either.rs | 2 +- vendor/yoke/src/lib.rs | 2 +- vendor/yoke/src/trait_hack.rs | 2 +- vendor/yoke/src/yoke.rs | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'vendor/yoke') diff --git a/vendor/yoke/.cargo-checksum.json b/vendor/yoke/.cargo-checksum.json index 4b8d4839c..f5a0ad2e7 100644 --- a/vendor/yoke/.cargo-checksum.json +++ b/vendor/yoke/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"73b21b61d53b8b31994e0a5f9509aa0d26212a28bcf2ac1606deb83c6e975197","LICENSE":"4ad7541d66a407234e2c84902124cef325c29f3e966353efdb800bedb8b8da21","README.md":"30321954bbc84770e2b50e8cc6da2a9e98f97698cbf1fe829747d4f3c6f6f791","src/either.rs":"028bb043392d1f3d608589d65d997a241b5ba7bb5114cf023179a38bf1c1cf2b","src/erased.rs":"a97a1be3436314e34903a59330a8f61f96f5543c73d96853c09c32392dd09898","src/lib.rs":"9168593ad938bb19c867a3fde27911003b108ae40efed87741bd5d036c914a39","src/macro_impls.rs":"f81ac8af77ac3641bfee116d6295f5f756f92d4b3b6c7d43a228cd313174d355","src/trait_hack.rs":"d3a8b93e0a984febabd288af558d25e5a93019e2bf9209bc023762c9182aa7fc","src/yoke.rs":"91f8f8b5ea15b42d79c0790eaf1e08607a42bd92e9773db05281e3e1eb9dbb82","src/yokeable.rs":"1b2e04f620ab7c06c557d23c44b7ebb67736ae239c44277f4fbefbacc011e549","src/zero_from.rs":"71d97f87e003db0eb0e97064509bdf9355622ccd655549f926b6a0d9119db3ee"},"package":"222180af14a6b54ef2c33493c1eff77ae95a3687a21b243e752624006fb8f26e"} \ No newline at end of file +{"files":{"Cargo.toml":"5a6f2a19935a914a211ba055aa3e55d3fd39a83376baced7aa1415631f746beb","LICENSE":"4ad7541d66a407234e2c84902124cef325c29f3e966353efdb800bedb8b8da21","README.md":"30321954bbc84770e2b50e8cc6da2a9e98f97698cbf1fe829747d4f3c6f6f791","src/either.rs":"cc98640a3b0aa349631c0bf5a54c18ec6e1ee638612b557e35e3a191e9178d42","src/erased.rs":"a97a1be3436314e34903a59330a8f61f96f5543c73d96853c09c32392dd09898","src/lib.rs":"3952340babcc97002faf3e12c29da9cc42c6c15870a930658a764236a80b2139","src/macro_impls.rs":"f81ac8af77ac3641bfee116d6295f5f756f92d4b3b6c7d43a228cd313174d355","src/trait_hack.rs":"34c6979cbacd85de650ba4a1f4b1cc344451e229172394f289432cdb7a4fa0c0","src/yoke.rs":"c3b2d01cf255b2f1192e2ebe31bc6c1df6710832fceb525be64ac0c26df1117a","src/yokeable.rs":"1b2e04f620ab7c06c557d23c44b7ebb67736ae239c44277f4fbefbacc011e549","src/zero_from.rs":"71d97f87e003db0eb0e97064509bdf9355622ccd655549f926b6a0d9119db3ee"},"package":"1848075a23a28f9773498ee9a0f2cf58fcbad4f8c0ccf84a210ab33c6ae495de"} \ No newline at end of file diff --git a/vendor/yoke/Cargo.toml b/vendor/yoke/Cargo.toml index a20e850b6..f6e400a64 100644 --- a/vendor/yoke/Cargo.toml +++ b/vendor/yoke/Cargo.toml @@ -10,9 +10,9 @@ # See Cargo.toml.orig for the original contents. [package] -edition = "2018" +edition = "2021" name = "yoke" -version = "0.7.0" +version = "0.7.1" authors = ["Manish Goregaokar "] include = [ "src/**/*", @@ -23,6 +23,7 @@ include = [ "README.md", ] description = "Abstraction allowing borrowed data to be carried along with the backing data it borrows from" +readme = "README.md" keywords = [ "zerocopy", "serialization", @@ -38,7 +39,6 @@ categories = [ ] license = "Unicode-DFS-2016" repository = "https://github.com/unicode-org/icu4x" -resolver = "2" [package.metadata.workspaces] independent = true diff --git a/vendor/yoke/src/either.rs b/vendor/yoke/src/either.rs index 3706177a2..6cddd61d7 100644 --- a/vendor/yoke/src/either.rs +++ b/vendor/yoke/src/either.rs @@ -46,7 +46,7 @@ use stable_deref_trait::StableDeref; /// let y5 = y4.clone(); /// assert_eq!(*y5.get(), "borrowed hello world"); /// ``` -#[derive(Clone, PartialEq, Eq)] +#[derive(Clone, PartialEq, Eq, Debug)] #[allow(clippy::exhaustive_enums)] // stable pub enum EitherCart { A(C0), diff --git a/vendor/yoke/src/lib.rs b/vendor/yoke/src/lib.rs index 1524c067c..289b47412 100644 --- a/vendor/yoke/src/lib.rs +++ b/vendor/yoke/src/lib.rs @@ -35,7 +35,7 @@ clippy::panic, clippy::exhaustive_structs, clippy::exhaustive_enums, - // TODO(#2266): enable missing_debug_implementations, + missing_debug_implementations, ) )] // The lifetimes here are important for safety and explicitly writing diff --git a/vendor/yoke/src/trait_hack.rs b/vendor/yoke/src/trait_hack.rs index 7687903f7..f3ffaee2b 100644 --- a/vendor/yoke/src/trait_hack.rs +++ b/vendor/yoke/src/trait_hack.rs @@ -285,7 +285,7 @@ use core::mem; /// } /// ``` #[repr(transparent)] -#[derive(Clone, PartialEq, Eq)] +#[derive(Clone, PartialEq, Eq, Debug)] #[allow(clippy::exhaustive_structs)] // newtype pub struct YokeTraitHack(pub T); diff --git a/vendor/yoke/src/yoke.rs b/vendor/yoke/src/yoke.rs index 7468b4d99..ef76aa86a 100644 --- a/vendor/yoke/src/yoke.rs +++ b/vendor/yoke/src/yoke.rs @@ -74,6 +74,7 @@ use alloc::sync::Arc; /// assert_eq!(&**yoke.get(), "hello"); /// assert!(matches!(yoke.get(), &Cow::Borrowed(_))); /// ``` +#[derive(Debug)] pub struct Yoke Yokeable<'a>, C> { // must be the first field for drop order // this will have a 'static lifetime parameter, that parameter is a lie @@ -1309,6 +1310,5 @@ const _: () = (); /// println!("pre-drop: {reference}"); /// drop(local); /// println!("post-drop: {reference}"); -/// /// ``` const _: () = (); -- cgit v1.2.3