blah/blahrs
1
0
Fork 0
mirror of https://github.com/Blah-IM/blahrs.git synced 2025-07-28 16:12:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: migrate to Rust edition 2024

Browse source
This commit is contained in:
oxalica 2025-03-18 11:37:56 -04:00
parent 37fbf5149e
commit 2e0a878d56
22 changed files with 64 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

10
blahd/tests/socket_activate.rs
View file

@ -8,12 +8,12 @@ use std::process::abort;
use std::ptr::null;
use std::time::Duration;
use nix::fcntl::{fcntl, FcntlArg, FdFlag};
use nix::fcntl::{FcntlArg, FdFlag, fcntl};
use nix::libc::execve;
use nix::sys::memfd::{memfd_create, MemFdCreateFlag};
use nix::sys::signal::{kill, Signal};
use nix::sys::wait::{waitpid, WaitStatus};
use nix::unistd::{alarm, dup2, fork, getpid, ForkResult};
use nix::sys::memfd::{MemFdCreateFlag, memfd_create};
use nix::sys::signal::{Signal, kill};
use nix::sys::wait::{WaitStatus, waitpid};
use nix::unistd::{ForkResult, alarm, dup2, fork, getpid};
use rstest::rstest;
use tokio::io::stderr;

6
blahd/tests/webapi.rs
View file

@ -26,9 +26,9 @@ use expect_test::expect;
use futures_util::future::BoxFuture;
use futures_util::{SinkExt, Stream, StreamExt, TryFutureExt};
use parking_lot::Mutex;
use reqwest::{header, Method, StatusCode};
use reqwest::{Method, StatusCode, header};
use rstest::{fixture, rstest};
use rusqlite::{params, Connection};
use rusqlite::{Connection, params};
use serde::de::DeserializeOwned;
use serde::{Deserialize, Serialize};
use serde_json::json;
@ -164,7 +164,7 @@ impl Server {
async fn connect_ws(
&self,
auth_user: Option<&User>,
) -> Result<impl Stream<Item = Result<ServerEvent>> + Unpin> {
) -> Result<impl Stream<Item = Result<ServerEvent>> + Unpin + use<>> {
let url = format!("ws://{}/_blah/ws", self.domain());
let (mut ws, _) = tokio_tungstenite::connect_async(url).await.unwrap();
if let Some(user) = auth_user {