fix clippy tests

Author: bend-n

src/tools/clippy/tests/ui/manual_try_fold.rs

@@ -4,7 +4,7 @@
 #![feature(try_trait_v2)]
 #![feature(try_trait_v2_residual)]
 //@no-rustfix
-use std::ops::{ControlFlow, FromResidual, Residual, Try};
+use std::ops::{ControlFlow, FromResidual, Residual, Try, FromOutput, Branch};
 
 #[macro_use]
 extern crate proc_macros;
@@ -24,19 +24,20 @@ impl Residual<()> for NotOptionResidual {
     type TryType = NotOption;
 }
 
-impl Try for NotOption {
+impl Branch for NotOption {
     type Output = ();
     type Residual = NotOptionResidual;
 
-    fn from_output(_: Self::Output) -> Self {
+    fn branch(self) -> ControlFlow<Self::Residual, Self::Output> {
         todo!()
     }
+}
 
-    fn branch(self) -> ControlFlow<Self::Residual, Self::Output> {
+impl FromOutput for NotOption {
+    fn from_output(_: Self::Output) -> Self {
         todo!()
     }
 }
-
 // Test custom `Try` with only 1 argument
 #[derive(Default)]
 struct NotOptionButWorse(i32);
@@ -53,15 +54,17 @@ impl Residual<()> for NotOptionButWorseResidual {
     type TryType = NotOptionButWorse;
 }
 
-impl Try for NotOptionButWorse {
+impl Branch for NotOptionButWorse {
     type Output = ();
     type Residual = NotOptionButWorseResidual;
 
-    fn from_output(_: Self::Output) -> Self {
+    fn branch(self) -> ControlFlow<Self::Residual, Self::Output> {
         todo!()
     }
+}
 
-    fn branch(self) -> ControlFlow<Self::Residual, Self::Output> {
+impl FromOutput for NotOptionButWorse {
+    fn from_output(_: Self::Output) -> Self {
         todo!()
     }
 }

src/tools/clippy/tests/ui/manual_try_fold.stderr

@@ -1,5 +1,5 @@
 error: usage of `Iterator::fold` on a type that implements `Try`
-  --> tests/ui/manual_try_fold.rs:72:10
+  --> tests/ui/manual_try_fold.rs:75:10
    |
 LL |         .fold(Some(0i32), |sum, i| sum?.checked_add(*i))
    |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `try_fold` instead: `try_fold(0i32, |sum, i| ...)`
@@ -8,19 +8,19 @@ LL |         .fold(Some(0i32), |sum, i| sum?.checked_add(*i))
    = help: to override `-D warnings` add `#[allow(clippy::manual_try_fold)]`
 
 error: usage of `Iterator::fold` on a type that implements `Try`
-  --> tests/ui/manual_try_fold.rs:77:10
+  --> tests/ui/manual_try_fold.rs:80:10
    |
 LL |         .fold(NotOption(0i32, 0i32), |sum, i| NotOption(0i32, 0i32));
    |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `try_fold` instead: `try_fold(..., |sum, i| ...)`
 
 error: usage of `Iterator::fold` on a type that implements `Try`
-  --> tests/ui/manual_try_fold.rs:81:10
+  --> tests/ui/manual_try_fold.rs:84:10
    |
 LL |         .fold(NotOptionButWorse(0i32), |sum, i| NotOptionButWorse(0i32));
    |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `try_fold` instead: `try_fold(0i32, |sum, i| ...)`
 
 error: usage of `Iterator::fold` on a type that implements `Try`
-  --> tests/ui/manual_try_fold.rs:112:10
+  --> tests/ui/manual_try_fold.rs:115:10
    |
 LL |         .fold(Some(0i32), |sum, i| sum?.checked_add(*i))
    |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `try_fold` instead: `try_fold(0i32, |sum, i| ...)`