Fix some warnings
This commit is contained in:
parent
18573e5a37
commit
9ac646174c
4 changed files with 8 additions and 13 deletions
|
|
@ -157,6 +157,7 @@ impl Joined {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
|
#[allow(clippy::large_enum_variant)]
|
||||||
pub enum Status {
|
pub enum Status {
|
||||||
Joining(Joining),
|
Joining(Joining),
|
||||||
Joined(Joined),
|
Joined(Joined),
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ pub enum Error {
|
||||||
enum Event {
|
enum Event {
|
||||||
Connected(ConnTx),
|
Connected(ConnTx),
|
||||||
Disconnected,
|
Disconnected,
|
||||||
Data(Data),
|
Data(Box<Data>),
|
||||||
Status(oneshot::Sender<Option<Status>>),
|
Status(oneshot::Sender<Option<Status>>),
|
||||||
RequestLogs,
|
RequestLogs,
|
||||||
Nick(String),
|
Nick(String),
|
||||||
|
|
@ -85,7 +85,7 @@ impl State {
|
||||||
event_tx.send(Event::Connected(conn_tx))?;
|
event_tx.send(Event::Connected(conn_tx))?;
|
||||||
|
|
||||||
while let Ok(data) = conn_rx.recv().await {
|
while let Ok(data) = conn_rx.recv().await {
|
||||||
event_tx.send(Event::Data(data))?;
|
event_tx.send(Event::Data(Box::new(data)))?;
|
||||||
}
|
}
|
||||||
|
|
||||||
info!("e&{}: disconnected", name);
|
info!("e&{}: disconnected", name);
|
||||||
|
|
@ -160,7 +160,7 @@ impl State {
|
||||||
self.conn_tx = None;
|
self.conn_tx = None;
|
||||||
self.last_msg_id = None;
|
self.last_msg_id = None;
|
||||||
}
|
}
|
||||||
Event::Data(data) => self.on_data(data).await?,
|
Event::Data(data) => self.on_data(*data).await?,
|
||||||
Event::Status(reply_tx) => self.on_status(reply_tx).await,
|
Event::Status(reply_tx) => self.on_status(reply_tx).await,
|
||||||
Event::RequestLogs => self.on_request_logs(),
|
Event::RequestLogs => self.on_request_logs(),
|
||||||
Event::Nick(name) => self.on_nick(name),
|
Event::Nick(name) => self.on_nick(name),
|
||||||
|
|
@ -342,12 +342,6 @@ impl Room {
|
||||||
rx.await.map_err(|_| Error::Stopped)
|
rx.await.map_err(|_| Error::Stopped)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn request_logs(&self) -> Result<(), Error> {
|
|
||||||
self.event_tx
|
|
||||||
.send(Event::RequestLogs)
|
|
||||||
.map_err(|_| Error::Stopped)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn nick(&self, name: String) -> Result<(), Error> {
|
pub fn nick(&self, name: String) -> Result<(), Error> {
|
||||||
self.event_tx
|
self.event_tx
|
||||||
.send(Event::Nick(name))
|
.send(Event::Nick(name))
|
||||||
|
|
|
||||||
|
|
@ -105,7 +105,7 @@ impl MsgStore<LogMsg> for Logger {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Log for Logger {
|
impl Log for Logger {
|
||||||
fn enabled(&self, metadata: &log::Metadata) -> bool {
|
fn enabled(&self, _metadata: &log::Metadata) -> bool {
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -102,7 +102,7 @@ impl EuphVault {
|
||||||
pub fn add_message(&self, msg: Message, prev_msg: Option<Snowflake>) {
|
pub fn add_message(&self, msg: Message, prev_msg: Option<Snowflake>) {
|
||||||
let request = EuphRequest::AddMsg {
|
let request = EuphRequest::AddMsg {
|
||||||
room: self.room.clone(),
|
room: self.room.clone(),
|
||||||
msg,
|
msg: Box::new(msg),
|
||||||
prev_msg,
|
prev_msg,
|
||||||
};
|
};
|
||||||
let _ = self.vault.tx.send(request.into());
|
let _ = self.vault.tx.send(request.into());
|
||||||
|
|
@ -232,7 +232,7 @@ pub(super) enum EuphRequest {
|
||||||
//////////////
|
//////////////
|
||||||
AddMsg {
|
AddMsg {
|
||||||
room: String,
|
room: String,
|
||||||
msg: Message,
|
msg: Box<Message>,
|
||||||
prev_msg: Option<Snowflake>,
|
prev_msg: Option<Snowflake>,
|
||||||
},
|
},
|
||||||
AddMsgs {
|
AddMsgs {
|
||||||
|
|
@ -286,7 +286,7 @@ impl EuphRequest {
|
||||||
room,
|
room,
|
||||||
msg,
|
msg,
|
||||||
prev_msg,
|
prev_msg,
|
||||||
} => Self::add_msg(conn, room, msg, prev_msg),
|
} => Self::add_msg(conn, room, *msg, prev_msg),
|
||||||
EuphRequest::AddMsgs {
|
EuphRequest::AddMsgs {
|
||||||
room,
|
room,
|
||||||
msgs,
|
msgs,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue