age-core: Add plugin::Error enum

age-plugin/CHANGELOG.md

@@ -11,6 +11,8 @@ to 1.0.0 are beta releases.
 ## [Unreleased]
 ### Changed
 - MSRV is now 1.51.0.
+- `age_plugin::Callbacks` methods now return `age_core::plugin::Error` instead
+  of `()` for internal errors, following changes to `age_core::plugin::Result`.
 
 ## [0.1.0] - 2021-05-02
 Initial beta release!

age-plugin/src/identity.rs

@@ -56,13 +56,13 @@ impl<'a, 'b, R: io::Read, W: io::Write> Callbacks<Error> for BidirCallbacks<'a,
     ///
     /// This can be used to prompt the user to take some physical action, such as
     /// inserting a hardware key.
-    fn message(&mut self, message: &str) -> plugin::Result<(), ()> {
+    fn message(&mut self, message: &str) -> plugin::Result<()> {
         self.0
             .send("msg", &[], message.as_bytes())
             .map(|res| res.map(|_| ()))
     }
 
-    fn request_public(&mut self, message: &str) -> plugin::Result<String, ()> {
+    fn request_public(&mut self, message: &str) -> plugin::Result<String> {
         self.0
             .send("request-public", &[], message.as_bytes())
             .and_then(|res| match res {
@@ -71,25 +71,25 @@ impl<'a, 'b, R: io::Read, W: io::Write> Callbacks<Error> for BidirCallbacks<'a,
                         io::Error::new(io::ErrorKind::InvalidData, "response is not UTF-8")
                     })
                     .map(Ok),
-                Err(()) => Ok(Err(())),
+                Err(e) => Ok(Err(e)),
             })
     }
 
     /// Requests a secret value from the user, such as a passphrase.
     ///
     /// `message` will be displayed to the user, providing context for the request.
-    fn request_secret(&mut self, message: &str) -> plugin::Result<SecretString, ()> {
+    fn request_secret(&mut self, message: &str) -> plugin::Result<SecretString> {
         self.0
             .send("request-secret", &[], message.as_bytes())
             .and_then(|res| match res {
                 Ok(s) => String::from_utf8(s.body)
                     .map_err(|_| io::Error::new(io::ErrorKind::InvalidData, "secret is not UTF-8"))
                     .map(|s| Ok(SecretString::new(s))),
-                Err(()) => Ok(Err(())),
+                Err(e) => Ok(Err(e)),
             })
     }
 
-    fn error(&mut self, error: Error) -> plugin::Result<(), ()> {
+    fn error(&mut self, error: Error) -> plugin::Result<()> {
         error.send(self.0).map(|()| Ok(()))
     }
 }

age-plugin/src/lib.rs

@@ -234,24 +234,24 @@ pub trait Callbacks<E> {
     ///
     /// This can be used to prompt the user to take some physical action, such as
     /// inserting a hardware key.
-    fn message(&mut self, message: &str) -> age_core::plugin::Result<(), ()>;
+    fn message(&mut self, message: &str) -> age_core::plugin::Result<()>;
 
     /// Requests a non-secret value from the user.
     ///
     /// `message` will be displayed to the user, providing context for the request.
     ///
     /// To request secrets, use [`Callbacks::request_secret`].
-    fn request_public(&mut self, message: &str) -> age_core::plugin::Result<String, ()>;
+    fn request_public(&mut self, message: &str) -> age_core::plugin::Result<String>;
 
     /// Requests a secret value from the user, such as a passphrase.
     ///
     /// `message` will be displayed to the user, providing context for the request.
-    fn request_secret(&mut self, message: &str) -> age_core::plugin::Result<SecretString, ()>;
+    fn request_secret(&mut self, message: &str) -> age_core::plugin::Result<SecretString>;
 
     /// Sends an error.
     ///
     /// Note: This API may be removed in a subsequent API refactor, after we've figured
     /// out how errors should be handled overall, and how to distinguish between hard and
     /// soft errors.
-    fn error(&mut self, error: E) -> age_core::plugin::Result<(), ()>;
+    fn error(&mut self, error: E) -> age_core::plugin::Result<()>;
 }

age-plugin/src/recipient.rs

@@ -56,13 +56,13 @@ impl<'a, 'b, R: io::Read, W: io::Write> Callbacks<Error> for BidirCallbacks<'a,
     ///
     /// This can be used to prompt the user to take some physical action, such as
     /// inserting a hardware key.
-    fn message(&mut self, message: &str) -> plugin::Result<(), ()> {
+    fn message(&mut self, message: &str) -> plugin::Result<()> {
         self.0
             .send("msg", &[], message.as_bytes())
             .map(|res| res.map(|_| ()))
     }
 
-    fn request_public(&mut self, message: &str) -> plugin::Result<String, ()> {
+    fn request_public(&mut self, message: &str) -> plugin::Result<String> {
         self.0
             .send("request-public", &[], message.as_bytes())
             .and_then(|res| match res {
@@ -71,25 +71,25 @@ impl<'a, 'b, R: io::Read, W: io::Write> Callbacks<Error> for BidirCallbacks<'a,
                         io::Error::new(io::ErrorKind::InvalidData, "response is not UTF-8")
                     })
                     .map(Ok),
-                Err(()) => Ok(Err(())),
+                Err(e) => Ok(Err(e)),
             })
     }
 
     /// Requests a secret value from the user, such as a passphrase.
     ///
     /// `message` will be displayed to the user, providing context for the request.
-    fn request_secret(&mut self, message: &str) -> plugin::Result<SecretString, ()> {
+    fn request_secret(&mut self, message: &str) -> plugin::Result<SecretString> {
         self.0
             .send("request-secret", &[], message.as_bytes())
             .and_then(|res| match res {
                 Ok(s) => String::from_utf8(s.body)
                     .map_err(|_| io::Error::new(io::ErrorKind::InvalidData, "secret is not UTF-8"))
                     .map(|s| Ok(SecretString::new(s))),
-                Err(()) => Ok(Err(())),
+                Err(e) => Ok(Err(e)),
             })
     }
 
-    fn error(&mut self, error: Error) -> plugin::Result<(), ()> {
+    fn error(&mut self, error: Error) -> plugin::Result<()> {
         error.send(self.0).map(|()| Ok(()))
     }
 }