Merge pull request #432 from shepmaster/undo

Revert "Allow yeeting context selectors to generate errors"
shepmaster · Dec 27, 2023 · 3fcc81a · 3fcc81a
2 parents c1faaa8 + 7b8e6a8
commit 3fcc81a
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 50 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -159,10 +159,6 @@ nightly_test_task:
     - cd compatibility-tests/backtrace-provider-api/
     - rustc --version
     - cargo test
-  yeet_selectors_test_script:
-    - cd compatibility-tests/yeet-selectors/
-    - rustc --version
-    - cargo test
   before_cache_script: rm -rf $CARGO_HOME/registry/index
 
 # Our Minimal Supported Rust Version (MSRV)

diff --git a/compatibility-tests/yeet-selectors/Cargo.toml b/compatibility-tests/yeet-selectors/Cargo.toml
diff --git a/compatibility-tests/yeet-selectors/rust-toolchain b/compatibility-tests/yeet-selectors/rust-toolchain
diff --git a/compatibility-tests/yeet-selectors/src/lib.rs b/compatibility-tests/yeet-selectors/src/lib.rs
diff --git a/snafu-derive/src/shared.rs b/snafu-derive/src/shared.rs
@@ -294,16 +294,6 @@ pub mod context_selector {
                         ::core::result::Result::Err(self.build())
                     }
                 }
-
-                impl<#(#original_generics_without_defaults,)* #(#user_field_generics,)*> ::core::convert::From<#parameterized_selector_name> for #parameterized_error_name
-                where
-                    #(#extended_where_clauses),*
-                {
-                    #[track_caller]
-                    fn from(other: #parameterized_selector_name) -> Self {
-                        other.build()
-                    }
-                }
             }
         }
 

diff --git a/tests/build-leaf-error.rs b/tests/build-leaf-error.rs
@@ -22,9 +22,3 @@ fn implements_error() {
 
     map_result().unwrap_err();
 }
-
-#[test]
-fn build_via_from_and_into() {
-    let _e = Error::from(MineSnafu);
-    let _e: Error = MineSnafu.into();
-}