summaryrefslogtreecommitdiff
path: root/src/cli.rs
diff options
context:
space:
mode:
authorOwen Jacobson <owen@grimoire.ca>2025-07-18 01:12:36 -0400
committerOwen Jacobson <owen@grimoire.ca>2025-07-22 18:19:15 -0400
commit792de8e49fa8a3c04bfb747adadf71572d753055 (patch)
tree98b1c0f92a35d91dafc2dd7b56b32260a3d2b6d9 /src/cli.rs
parenta5df5a88400e64ea752c396bfbea868df2f3f714 (diff)
Remove `pilcrow::cli::Error` from the lib crate's public interface.
This might be the pettiest rude change I've ever made to a Rust program. If I saw this - or did this - in code _intend_ to be used as a library, I'd be appalled.
Diffstat (limited to 'src/cli.rs')
-rw-r--r--src/cli.rs13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/cli.rs b/src/cli.rs
index 8dac8ff..703bf19 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -84,11 +84,10 @@ impl Args {
/// # Errors
///
/// Will return `Err` if the server is unable to start, or terminates
- /// prematurely. The specific [`Error`] variant will expose the cause
+ /// prematurely. The returned error contains a user-facing explanation
/// of the failure.
- pub async fn run(self) -> Result<(), Error> {
+ pub async fn run(self) -> Result<(), impl std::error::Error> {
self.umask.set();
-
let pool = self.pool().await?;
let app = App::from(pool);
@@ -104,7 +103,7 @@ impl Args {
println!("{started_msg}");
serve.await?;
- Ok(())
+ Result::<_, Error>::Ok(())
}
async fn listener(&self) -> io::Result<net::TcpListener> {
@@ -138,14 +137,10 @@ fn started_msg(listener: &net::TcpListener) -> io::Result<String> {
Ok(format!("listening on http://{local_addr}/"))
}
-/// Errors that can be raised by [`Args::run`].
#[derive(Debug, thiserror::Error)]
#[error(transparent)]
-pub enum Error {
- /// Failure due to an I/O-related error.
+enum Error {
Io(#[from] io::Error),
- /// Failure due to a database initialization error.
Database(#[from] db::Error),
- /// Failure due to invalid umask-related options.
Umask(#[from] umask::Error),
}