magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

run cargo fix for rust 2024 changes and rustfmt

Browse source 
Signed-off-by: June Clementine Strawberry <strawberry@puppygock.gay>
This commit is contained in:
June Clementine Strawberry 2025-02-23 01:17:45 -05:00
parent e97952b7f6
commit a1e1f40ded
No known key found for this signature in database
320 changed files with 2212 additions and 2039 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/service/admin/console.rs
View file

@ -5,14 +5,14 @@ use std::{
sync::{Arc, Mutex},
};
use conduwuit::{debug, defer, error, log, log::is_systemd_mode, Server};
use conduwuit::{Server, debug, defer, error, log, log::is_systemd_mode};
use futures::future::{AbortHandle, Abortable};
use ruma::events::room::message::RoomMessageEventContent;
use rustyline_async::{Readline, ReadlineError, ReadlineEvent};
use termimad::MadSkin;
use tokio::task::JoinHandle;
use crate::{admin, Dep};
use crate::{Dep, admin};
pub struct Console {
server: Arc<Server>,
@ -221,7 +221,7 @@ pub fn print(markdown: &str) {
}
fn configure_output_err(mut output: MadSkin) -> MadSkin {
use termimad::{crossterm::style::Color, Alignment, CompoundStyle, LineStyle};
use termimad::{Alignment, CompoundStyle, LineStyle, crossterm::style::Color};
let code_style = CompoundStyle::with_fgbg(Color::AnsiValue(196), Color::AnsiValue(234));
output.inline_code = code_style.clone();
@ -236,7 +236,7 @@ fn configure_output_err(mut output: MadSkin) -> MadSkin {
}
fn configure_output(mut output: MadSkin) -> MadSkin {
use termimad::{crossterm::style::Color, Alignment, CompoundStyle, LineStyle};
use termimad::{Alignment, CompoundStyle, LineStyle, crossterm::style::Color};
let code_style = CompoundStyle::with_fgbg(Color::AnsiValue(40), Color::AnsiValue(234));
output.inline_code = code_style.clone();

4
src/service/admin/create.rs
View file

@ -1,7 +1,8 @@
use std::collections::BTreeMap;
use conduwuit::{pdu::PduBuilder, Result};
use conduwuit::{Result, pdu::PduBuilder};
use ruma::{
RoomId, RoomVersionId,
events::room::{
canonical_alias::RoomCanonicalAliasEventContent,
create::RoomCreateEventContent,
@ -14,7 +15,6 @@ use ruma::{
preview_url::RoomPreviewUrlsEventContent,
topic::RoomTopicEventContent,
},
RoomId, RoomVersionId,
};
use crate::Services;

4
src/service/admin/execute.rs
View file

@ -1,6 +1,6 @@
use conduwuit::{debug, debug_info, error, implement, info, Err, Result};
use conduwuit::{Err, Result, debug, debug_info, error, implement, info};
use ruma::events::room::message::RoomMessageEventContent;
use tokio::time::{sleep, Duration};
use tokio::time::{Duration, sleep};
pub(super) const SIGNAL: &str = "SIGUSR2";

6
src/service/admin/grant.rs
View file

@ -1,17 +1,17 @@
use std::collections::BTreeMap;
use conduwuit::{error, implement, Result};
use conduwuit::{Result, error, implement};
use ruma::{
RoomId, UserId,
events::{
RoomAccountDataEventType,
room::{
member::{MembershipState, RoomMemberEventContent},
message::RoomMessageEventContent,
power_levels::RoomPowerLevelsEventContent,
},
tag::{TagEvent, TagEventContent, TagInfo},
RoomAccountDataEventType,
},
RoomId, UserId,
};
use crate::pdu::PduBuilder;

6
src/service/admin/mod.rs
View file

@ -11,18 +11,18 @@ use std::{
use async_trait::async_trait;
use conduwuit::{
debug, err, error, error::default_log, pdu::PduBuilder, Error, PduEvent, Result, Server,
Error, PduEvent, Result, Server, debug, err, error, error::default_log, pdu::PduBuilder,
};
pub use create::create_admin_room;
use futures::{FutureExt, TryFutureExt};
use loole::{Receiver, Sender};
use ruma::{
events::room::message::{Relation, RoomMessageEventContent},
OwnedEventId, OwnedRoomId, RoomId, UserId,
events::room::message::{Relation, RoomMessageEventContent},
};
use tokio::sync::RwLock;
use crate::{account_data, globals, rooms, rooms::state::RoomMutexGuard, Dep};
use crate::{Dep, account_data, globals, rooms, rooms::state::RoomMutexGuard};
pub struct Service {
services: Services,