aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeddy Wing2020-07-04 02:46:01 +0200
committerTeddy Wing2020-07-04 02:46:01 +0200
commitcdad0271c909c90e800a7e9dd95658b143475d15 (patch)
tree41601b3ad1f4542b96ba6bf9b3cd0248ce979e3f
parent6360e9f37a0a65fbc65d9e923db9ef8f5b77ff83 (diff)
downloadfastcgi-conduit-cdad0271c909c90e800a7e9dd95658b143475d15.tar.bz2
server: Rename `Error::Io` to `Error::WriteError`
Make this specifically about errors writing instead of a generic I/O error. Name the variant `WriteError` instead of `Write` because Snafu will generate context selector structs with these names and we already have a `Write` identifier imported.
-rw-r--r--src/server.rs20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/server.rs b/src/server.rs
index 0f45f5e..e3e5d9a 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -14,7 +14,7 @@ const HTTP_VERSION: &'static str = "HTTP/1.1";
#[derive(Debug, Snafu)]
pub enum Error {
#[snafu(display("{}", source))]
- Io { source: io::Error },
+ WriteError { source: io::Error },
#[snafu(display("Couldn't build request: {}", source))]
RequestBuilder { source: request::Error },
@@ -35,7 +35,7 @@ impl Server {
// TODO: log
// Ignore write errors as clients will have closed the
// connection by this point.
- Err(Error::Io { .. }) => (),
+ Err(Error::WriteError { .. }) => (),
Err(Error::RequestBuilder { .. }) =>
internal_server_error(&mut raw_request.stdout()),
@@ -71,20 +71,20 @@ where H: Handler + 'static + Sync
head.status.as_str(),
head.status.canonical_reason().unwrap_or("UNKNOWN"),
)
- .context(Io)?;
+ .context(WriteError)?;
for (name, value) in head.headers.iter() {
- write!(&mut stdout, "{}: ", name).context(Io)?;
- stdout.write(value.as_bytes()).context(Io)?;
- stdout.write(b"\r\n").context(Io)?;
+ write!(&mut stdout, "{}: ", name).context(WriteError)?;
+ stdout.write(value.as_bytes()).context(WriteError)?;
+ stdout.write(b"\r\n").context(WriteError)?;
}
- stdout.write(b"\r\n").context(Io)?;
+ stdout.write(b"\r\n").context(WriteError)?;
match body {
- conduit::Body::Static(slice) => stdout.write(slice).map(|_| ()).context(Io)?,
- conduit::Body::Owned(vec) => stdout.write(&vec).map(|_| ()).context(Io)?,
- conduit::Body::File(mut file) => io::copy(&mut file, &mut stdout).map(|_| ()).context(Io)?,
+ conduit::Body::Static(slice) => stdout.write(slice).map(|_| ()).context(WriteError)?,
+ conduit::Body::Owned(vec) => stdout.write(&vec).map(|_| ()).context(WriteError)?,
+ conduit::Body::File(mut file) => io::copy(&mut file, &mut stdout).map(|_| ()).context(WriteError)?,
};
Ok(())