blah/blahrs
1
0
Fork 0
mirror of https://github.com/Blah-IM/blahrs.git synced 2025-07-01 03:55:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build(deps): update to rusqlite 0.34, rustix 1 and fix warnings

Browse source
This commit is contained in:
oxalica 2025-03-18 11:12:46 -04:00
parent 740e540b4b
commit 37fbf5149e
8 changed files with 312 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

4
blahd/Cargo.toml
View file

@ -23,8 +23,8 @@ parking_lot = "0.12" # Maybe no better performance, just that we hate poisoning.
paste = "1.0.15"
rand = "0.8"
reqwest = "0.12"
rusqlite = { version = "0.33", features = ["rusqlite-macros"] }
rustix = { version = "0.38", features = ["net"] }
rusqlite = { version = "0.34", features = ["rusqlite-macros"] }
rustix = { version = "1", features = ["net"] }
sd-notify = "0.4"
serde = { version = "1", features = ["derive"] }
serde-constant = "0.1"

23
blahd/src/bin/blahd.rs
View file

@ -65,7 +65,7 @@ async fn main_serve(db: Database, config: Config) -> Result<()> {
.context("failed to listen on socket")?,
),
ListenConfig::Systemd(_) => {
use rustix::net::{getsockname, SocketAddrAny};
use rustix::net::{getsockname, SocketAddr};
let [fd] = sd_notify::listen_fds()
.context("failed to get fds from sd_listen_fds(3)")?
@ -76,19 +76,18 @@ async fn main_serve(db: Database, config: Config) -> Result<()> {
let listener = unsafe { OwnedFd::from_raw_fd(fd) };
let addr = getsockname(&listener).context("failed to getsockname")?;
match addr {
SocketAddrAny::V4(_) | SocketAddrAny::V6(_) => {
let listener = std::net::TcpListener::from(listener);
listener
.set_nonblocking(true)
.context("failed to set socket non-blocking")?;
let listener = tokio::net::TcpListener::from_std(listener)
.context("failed to register async socket")?;
(format!("tcp socket {addr:?} from LISTEN_FDS"), listener)
}
if let Ok(addr) = SocketAddr::try_from(addr.clone()) {
let listener = std::net::TcpListener::from(listener);
listener
.set_nonblocking(true)
.context("failed to set socket non-blocking")?;
let listener = tokio::net::TcpListener::from_std(listener)
.context("failed to register async socket")?;
(format!("tcp socket {addr:?} from LISTEN_FDS"), listener)
} else {
// Unix socket support for axum is currently overly complex.
// WAIT: https://github.com/tokio-rs/axum/pull/2479
_ => bail!("unsupported socket type from LISTEN_FDS: {addr:?}"),
bail!("unsupported socket type from LISTEN_FDS: {addr:?}");
}
}
};

2
blahd/tests/webapi.rs
View file

@ -111,7 +111,7 @@ impl<T: fmt::Debug> ResultExt for Result<T> {
assert_eq!(
(err.status, &*err.code),
(status, code),
"unexpecteed API error: {err}",
"unexpected API error: {err}",
);
}