Merging upstream version 1.76.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 12 insertions, 12 deletions

diff --git a/vendor/proptest/src/arbitrary/_alloc/ops.rs b/vendor/proptest/src/arbitrary/_alloc/ops.rs
index 338f52c50..ab1ffa7bb 100644
--- a/vendor/proptest/src/arbitrary/_alloc/ops.rs
+++ b/vendor/proptest/src/arbitrary/_alloc/ops.rs
@@ -48,14 +48,14 @@ lift1!([PartialOrd] Range<A>; base => {
 
 #[cfg(feature = "unstable")]
 arbitrary!(
-    [Y: Arbitrary, R: Arbitrary] GeneratorState<Y, R>,
+    [Y: Arbitrary, R: Arbitrary] CoroutineState<Y, R>,
     TupleUnion<(WA<SMapped<Y, Self>>, WA<SMapped<R, Self>>)>,
     product_type![Y::Parameters, R::Parameters];
     args => {
         let product_unpack![y, r] = args;
         prop_oneof![
-            static_map(any_with::<Y>(y), GeneratorState::Yielded),
-            static_map(any_with::<R>(r), GeneratorState::Complete)
+            static_map(any_with::<Y>(y), CoroutineState::Yielded),
+            static_map(any_with::<R>(r), CoroutineState::Complete)
         ]
     }
 );
@@ -65,7 +65,7 @@ use core::fmt;
 
 #[cfg(feature = "unstable")]
 impl<A: fmt::Debug + 'static, B: fmt::Debug + 'static>
-    functor::ArbitraryF2<A, B> for GeneratorState<A, B>
+    functor::ArbitraryF2<A, B> for CoroutineState<A, B>
 {
     type Parameters = ();
 
@@ -79,8 +79,8 @@ impl<A: fmt::Debug + 'static, B: fmt::Debug + 'static>
         BS: Strategy<Value = B> + 'static,
     {
         prop_oneof![
-            fst.prop_map(GeneratorState::Yielded),
-            snd.prop_map(GeneratorState::Complete)
+            fst.prop_map(CoroutineState::Yielded),
+            snd.prop_map(CoroutineState::Complete)
         ]
         .boxed()
     }
@@ -99,6 +99,6 @@ mod test {
 
     #[cfg(feature = "unstable")]
     no_panic_test!(
-        generator_state => GeneratorState<u32, u64>
+        generator_state => CoroutineState<u32, u64>
     );
 }
diff --git a/vendor/proptest/src/lib.rs b/vendor/proptest/src/lib.rs
index 72b90ffbf..aa5c9e8cf 100644
--- a/vendor/proptest/src/lib.rs
+++ b/vendor/proptest/src/lib.rs
@@ -24,7 +24,7 @@
 ))]
 #![cfg_attr(
     feature = "unstable",
-    feature(allocator_api, try_trait_v2, generator_trait, never_type)
+    feature(allocator_api, try_trait_v2, coroutine_trait, never_type)
 )]
 #![cfg_attr(all(feature = "std", feature = "unstable"), feature(ip))]
 #![cfg_attr(docsrs, feature(doc_cfg))]
diff --git a/vendor/proptest/src/sugar.rs b/vendor/proptest/src/sugar.rs
index 6b76b30cf..2dbd8e999 100644
--- a/vendor/proptest/src/sugar.rs
+++ b/vendor/proptest/src/sugar.rs
@@ -971,11 +971,11 @@ macro_rules! proptest_helper {
             $($mod)* |$crate::sugar::NamedArguments(
                 _, $crate::proptest_helper!(@_WRAPPAT ($($parm),*)))|
             {
-                let _: () = $body;
+                let (): () = $body;
                 Ok(())
             })
         {
-            Ok(_) => (),
+            Ok(()) => (),
             Err(e) => panic!("{}\n{}", e, runner),
         }
     }};
@@ -991,11 +991,11 @@ macro_rules! proptest_helper {
             $($mod)* |$crate::sugar::NamedArguments(
                 _, $crate::proptest_helper!(@_EXT _PAT ($($arg)*)))|
             {
-                let _: () = $body;
+                let (): () = $body;
                 Ok(())
             })
         {
-            Ok(_) => (),
+            Ok(()) => (),
             Err(e) => panic!("{}\n{}", e, runner),
         }
     }};