YGGverse/agate
1
0
Fork 0
mirror of https://github.com/YGGverse/agate.git synced 2026-04-08 12:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

automatically fix lint clippy::uninlined_format_args

Browse source
This commit is contained in:
Johann150 2023-03-17 17:28:40 +01:00
parent 771a7590c5
commit a199b41257
No known key found for this signature in database
GPG key ID: 9EE6577A2A06F8F1
3 changed files with 24 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/certificates.rs
View file

@ -47,15 +47,14 @@ impl Display for CertLoadError {
match self { match self {
Self::NoReadCertDir => write!(f, "Could not read from certificate directory."), Self::NoReadCertDir => write!(f, "Could not read from certificate directory."),
Self::Empty => write!(f, "No keys or certificates were found in the given directory.\nSpecify the --hostname option to generate these automatically."), Self::Empty => write!(f, "No keys or certificates were found in the given directory.\nSpecify the --hostname option to generate these automatically."),
Self::BadKey(domain, err) => write!(f, "The key file for {} is malformed: {:?}", domain, err), Self::BadKey(domain, err) => write!(f, "The key file for {domain} is malformed: {err:?}"),
Self::MissingKey(domain) => write!(f, "The key file for {} is missing.", domain), Self::MissingKey(domain) => write!(f, "The key file for {domain} is missing."),
Self::MissingCert(domain) => { Self::MissingCert(domain) => {
write!(f, "The certificate file for {} is missing.", domain) write!(f, "The certificate file for {domain} is missing.")
} }
Self::EmptyDomain(domain) => write!( Self::EmptyDomain(domain) => write!(
f, f,
"A folder for {} exists, but there is no certificate or key file.", "A folder for {domain} exists, but there is no certificate or key file."
domain
), ),
} }
} }

31
src/main.rs
View file

@ -46,7 +46,7 @@ fn main() {
let default = PresetMeta::Parameters( let default = PresetMeta::Parameters(
ARGS.language ARGS.language
.as_ref() .as_ref()
.map_or(String::new(), |lang| format!(";lang={}", lang)), .map_or(String::new(), |lang| format!(";lang={lang}")),
); );
let mimetypes = Arc::new(Mutex::new(FileOptions::new(default))); let mimetypes = Arc::new(Mutex::new(FileOptions::new(default)));
@ -62,7 +62,7 @@ fn main() {
let listener = match TcpListener::bind(addr).await { let listener = match TcpListener::bind(addr).await {
Err(e) => { Err(e) => {
if !(addr.ip().is_unspecified() && listening_unspecified) { if !(addr.ip().is_unspecified() && listening_unspecified) {
panic!("Failed to listen on {}: {}", addr, e) panic!("Failed to listen on {addr}: {e}")
} else { } else {
// already listening on the other unspecified address // already listening on the other unspecified address
log::warn!("Could not start listener on {}, but already listening on another unspecified address. Probably your system automatically listens in dual stack?", addr); log::warn!("Could not start listener on {}, but already listening on another unspecified address. Probably your system automatically listens in dual stack?", addr);
@ -78,7 +78,7 @@ fn main() {
loop { loop {
let (stream, _) = listener.accept().await.unwrap_or_else(|e| { let (stream, _) = listener.accept().await.unwrap_or_else(|e| {
panic!("could not accept new connection on {}: {}", addr, e) panic!("could not accept new connection on {addr}: {e}")
}); });
let arc = arc.clone(); let arc = arc.clone();
tokio::spawn(async { tokio::spawn(async {
@ -104,7 +104,7 @@ type Result<T = (), E = Box<dyn Error + Send + Sync>> = std::result::Result<T, E
static ARGS: Lazy<Args> = Lazy::new(|| { static ARGS: Lazy<Args> = Lazy::new(|| {
args().unwrap_or_else(|s| { args().unwrap_or_else(|s| {
eprintln!("{}", s); eprintln!("{s}");
std::process::exit(1); std::process::exit(1);
}) })
}); });
@ -140,7 +140,7 @@ fn args() -> Result<Args> {
opts.optmulti( opts.optmulti(
"", "",
"addr", "addr",
&format!("Address to listen on (default 0.0.0.0:{} and [::]:{}; muliple occurences means listening on multiple interfaces)", DEFAULT_PORT, DEFAULT_PORT), &format!("Address to listen on (default 0.0.0.0:{DEFAULT_PORT} and [::]:{DEFAULT_PORT}; muliple occurences means listening on multiple interfaces)"),
"IP:PORT", "IP:PORT",
); );
opts.optmulti( opts.optmulti(
@ -316,7 +316,7 @@ fn check_path(s: String) -> Result<PathBuf, String> {
if p.as_path().exists() { if p.as_path().exists() {
Ok(p) Ok(p)
} else { } else {
Err(format!("No such file: {:?}", p)) Err(format!("No such file: {p:?}"))
} }
} }
@ -357,8 +357,7 @@ impl RequestHandle {
.map_err(|_| { .map_err(|_| {
format!( format!(
// use nonexistent status code 01 if peer IP is unknown // use nonexistent status code 01 if peer IP is unknown
"{} - \"\" 01 \"IP error\" error:could not get peer address", "{local_addr} - \"\" 01 \"IP error\" error:could not get peer address",
local_addr,
) )
})? })?
.ip() .ip()
@ -368,7 +367,7 @@ impl RequestHandle {
"-".into() "-".into()
}; };
let log_line = format!("{} {}", local_addr, peer_addr,); let log_line = format!("{local_addr} {peer_addr}",);
match TLS.accept(stream).await { match TLS.accept(stream).await {
Ok(stream) => Ok(Self { Ok(stream) => Ok(Self {
@ -377,7 +376,7 @@ impl RequestHandle {
metadata, metadata,
}), }),
// use nonexistent status code 00 if connection was not established // use nonexistent status code 00 if connection was not established
Err(e) => Err(format!("{} \"\" 00 \"TLS error\" error:{}", log_line, e)), Err(e) => Err(format!("{log_line} \"\" 00 \"TLS error\" error:{e}")),
} }
} }
@ -439,7 +438,7 @@ impl RequestHandle {
})?; })?;
// log literal request (might be different from or not an actual URL) // log literal request (might be different from or not an actual URL)
write!(self.log_line, " \"{}\"", request).unwrap(); write!(self.log_line, " \"{request}\"").unwrap();
let mut url = Url::parse(request).or(Err((BAD_REQUEST, "Invalid URL")))?; let mut url = Url::parse(request).or(Err((BAD_REQUEST, "Invalid URL")))?;
@ -589,7 +588,7 @@ impl RequestHandle {
// guess the MIME type and add the parameters // guess the MIME type and add the parameters
PresetMeta::Parameters(params) => { PresetMeta::Parameters(params) => {
if path.extension() == Some(OsStr::new("gmi")) { if path.extension() == Some(OsStr::new("gmi")) {
format!("text/gemini{}", params) format!("text/gemini{params}")
} else { } else {
let mime = mime_guess::from_path(&path).first_or_octet_stream(); let mime = mime_guess::from_path(&path).first_or_octet_stream();
format!("{}{}", mime.essence_str(), params) format!("{}{}", mime.essence_str(), params)
@ -645,8 +644,8 @@ impl RequestHandle {
name += "/"; name += "/";
} }
let line = match percent_encode(name.as_bytes(), &ENCODE_SET).into() { let line = match percent_encode(name.as_bytes(), &ENCODE_SET).into() {
Cow::Owned(url) => format!("=> {} {}\n", url, name), Cow::Owned(url) => format!("=> {url} {name}\n"),
Cow::Borrowed(url) => format!("=> {}\n", url), // url and name are identical Cow::Borrowed(url) => format!("=> {url}\n"), // url and name are identical
}; };
lines.push(line); lines.push(line);
} }
@ -659,10 +658,10 @@ impl RequestHandle {
async fn send_header(&mut self, status: u8, meta: &str) -> Result { async fn send_header(&mut self, status: u8, meta: &str) -> Result {
// add response status and response meta // add response status and response meta
write!(self.log_line, " {} \"{}\"", status, meta)?; write!(self.log_line, " {status} \"{meta}\"")?;
self.stream self.stream
.write_all(format!("{} {}\r\n", status, meta).as_bytes()) .write_all(format!("{status} {meta}\r\n").as_bytes())
.await?; .await?;
Ok(()) Ok(())
} }

10
tests/tests.rs
View file

@ -51,7 +51,7 @@ impl Server {
let mut reader = BufReader::new(server.stderr.as_mut().unwrap()); let mut reader = BufReader::new(server.stderr.as_mut().unwrap());
let mut buffer = String::new(); let mut buffer = String::new();
while matches!(reader.read_line(&mut buffer), Ok(i) if i>0) { while matches!(reader.read_line(&mut buffer), Ok(i) if i>0) {
print!("log: {}", buffer); print!("log: {buffer}");
if buffer.contains("Started") { if buffer.contains("Started") {
break; break;
} }
@ -81,7 +81,7 @@ impl Server {
} }
self.output = Some(match self.server.try_wait() { self.output = Some(match self.server.try_wait() {
Err(e) => Err(format!("cannot access orchestrated program: {:?}", e)), Err(e) => Err(format!("cannot access orchestrated program: {e:?}")),
Ok(None) => { Ok(None) => {
// everything fine, still running as expected, kill it now // everything fine, still running as expected, kill it now
self.server.kill().unwrap(); self.server.kill().unwrap();
@ -89,7 +89,7 @@ impl Server {
let mut reader = BufReader::new(self.server.stderr.as_mut().unwrap()); let mut reader = BufReader::new(self.server.stderr.as_mut().unwrap());
let mut buffer = String::new(); let mut buffer = String::new();
while matches!(reader.read_line(&mut buffer), Ok(i) if i>0) { while matches!(reader.read_line(&mut buffer), Ok(i) if i>0) {
print!("log: {}", buffer); print!("log: {buffer}");
if buffer.contains("Listening") { if buffer.contains("Listening") {
break; break;
} }
@ -100,7 +100,7 @@ impl Server {
let mut reader = BufReader::new(self.server.stderr.as_mut().unwrap()); let mut reader = BufReader::new(self.server.stderr.as_mut().unwrap());
let mut buffer = String::new(); let mut buffer = String::new();
while matches!(reader.read_line(&mut buffer), Ok(i) if i>0) { while matches!(reader.read_line(&mut buffer), Ok(i) if i>0) {
print!("log: {}", buffer); print!("log: {buffer}");
if buffer.contains("Listening") { if buffer.contains("Listening") {
break; break;
} }
@ -121,7 +121,7 @@ impl Drop for Server {
// server was already stopped // server was already stopped
} else { } else {
// we are panicking and a potential error was not handled // we are panicking and a potential error was not handled
self.stop().unwrap_or_else(|e| eprintln!("{}", e)); self.stop().unwrap_or_else(|e| eprintln!("{e}"));
} }
} }
} }