commit 270f096cb0529cb9cb5453b8566d4b72bec576a0
parent 2fe0c07abd7925383fd00be5a2dc67a2fb558eb6
Author: Marcel <mtrnord1@gmail.com>
Date: Tue, 16 Jun 2020 22:15:17 +0200
Apply some clippy warnings
Took 6 minutes
Diffstat:
9 files changed, 40 insertions(+), 58 deletions(-)
diff --git a/src/app/components/event_list.rs b/src/app/components/event_list.rs
@@ -14,7 +14,6 @@ use crate::app::components::{
use crate::app::matrix::{MatrixAgent, Request, Response};
pub struct EventList {
- link: ComponentLink<Self>,
on_submit: Callback<String>,
state: State,
matrix_agent: Box<dyn Bridge<MatrixAgent>>,
@@ -62,7 +61,6 @@ impl Component for EventList {
EventList {
on_submit: link.callback(Msg::SendMessage),
props,
- link,
matrix_agent,
state,
}
@@ -125,7 +123,7 @@ impl Component for EventList {
fn change(&mut self, props: Self::Properties) -> bool {
if self.props != props {
- if props.clone().current_room.is_some() {
+ if props.current_room.is_some() {
let room_id = props.clone().current_room.unwrap().room_id;
if !self.state.events.contains_key(&room_id) {
self.matrix_agent
diff --git a/src/app/components/events/notice.rs b/src/app/components/events/notice.rs
@@ -62,7 +62,7 @@ impl Component for Notice {
"".to_string()
};
- let mut pure_content = self.props.notice_event.clone().unwrap().body.clone();
+ let mut pure_content = self.props.notice_event.clone().unwrap().body;
let finder = LinkFinder::new();
let pure_content_clone = pure_content.clone();
let links: Vec<_> = finder.links(&pure_content_clone).collect();
@@ -72,7 +72,7 @@ impl Component for Notice {
let html_link = format!("<a href={}>{}</a>", link.as_str(), link.as_str());
pure_content.replace_range(link.start()..link.end(), &html_link);
}
- pure_content.clone()
+ pure_content
} else {
pure_content
};
@@ -81,7 +81,7 @@ impl Component for Notice {
let full_html = format!(
"<p style=\"opacity: .6;\"><displayname>{}: </displayname>{}</p>",
sender_displayname,
- content.clone()
+ content
);
let js_text_event = {
let div = web_sys::window()
@@ -96,7 +96,7 @@ impl Component for Notice {
let node = Node::from(js_text_event);
VNode::VRef(node)
} else {
- let full_html = format!("<p style=\"opacity: .6;\">{}</p>", content.clone());
+ let full_html = format!("<p style=\"opacity: .6;\">{}</p>", content);
let js_text_event = {
let div = web_sys::window()
.unwrap()
diff --git a/src/app/components/events/text.rs b/src/app/components/events/text.rs
@@ -61,7 +61,7 @@ impl Component for Text {
"".to_string()
};
- let mut pure_content = self.props.text_event.clone().unwrap().body.clone();
+ let mut pure_content = self.props.text_event.clone().unwrap().body;
let finder = LinkFinder::new();
let pure_content_clone = pure_content.clone();
let links: Vec<_> = finder.links(&pure_content_clone).collect();
@@ -71,7 +71,7 @@ impl Component for Text {
let html_link = format!("<a href={}>{}</a>", link.as_str(), link.as_str());
pure_content.replace_range(link.start()..link.end(), &html_link);
}
- pure_content.clone()
+ pure_content
} else {
pure_content
};
@@ -114,7 +114,7 @@ impl Component for Text {
let full_html = format!(
"<p><displayname>{}: </displayname>{}</p>",
sender_displayname,
- content.clone()
+ content
);
let js_text_event = {
let div = web_sys::window()
@@ -129,7 +129,7 @@ impl Component for Text {
let node = Node::from(js_text_event);
VNode::VRef(node)
} else {
- let full_html = format!("<p>{}</p>", content.clone());
+ let full_html = format!("<p>{}</p>", content);
let js_text_event = {
let div = web_sys::window()
.unwrap()
diff --git a/src/app/components/events/video.rs b/src/app/components/events/video.rs
@@ -59,7 +59,7 @@ impl Component for Video {
"".to_string()
};
- let caption = format!(
+ let _caption = format!(
"{}: {}",
sender_displayname,
self.props.video_event.as_ref().unwrap().body
diff --git a/src/app/components/room_list.rs b/src/app/components/room_list.rs
@@ -101,10 +101,8 @@ impl Component for RoomList {
_ => false,
},
Msg::ChangeRoom(room) => {
- if self.state.current_room.is_some() {
- if self.state.current_room.as_ref().unwrap() == &room {
- return false;
- }
+ if self.state.current_room.is_some() && self.state.current_room.as_ref().unwrap() == &room {
+ return false;
}
self.props.change_room_callback.emit(room.clone());
self.state.current_room = Some(room);
diff --git a/src/app/matrix/sync.rs b/src/app/matrix/sync.rs
@@ -74,7 +74,7 @@ impl Sync {
cloned_event.clone(),
);
let displayname =
- get_sender_displayname(clean_room.clone(), cloned_event.clone());
+ get_sender_displayname(clean_room, cloned_event.clone());
let notification =
Notifications::new(avatar_url, displayname, text_event.body.clone());
diff --git a/src/app/mod.rs b/src/app/mod.rs
@@ -24,20 +24,10 @@ pub enum Msg {
NewMessage(Response),
}
pub struct App {
- matrix_agent: Box<dyn Bridge<MatrixAgent>>,
- link: ComponentLink<Self>,
route: Option<Route<()>>,
route_agent: Box<dyn Bridge<RouteAgent<()>>>,
}
-impl App {
- fn change_route(&self, app_route: AppRoute) -> Callback<MouseEvent> {
- self.link.callback(move |_| {
- let route = app_route.clone();
- Msg::ChangeRoute(route)
- })
- }
-}
impl Component for App {
type Message = Msg;
type Properties = ();
@@ -47,10 +37,8 @@ impl Component for App {
let mut matrix_agent = MatrixAgent::bridge(link.callback(Msg::NewMessage));
matrix_agent.send(matrix::Request::GetLoggedIn);
App {
- matrix_agent,
route_agent,
- route: None,
- link,
+ route: None
}
}
diff --git a/src/app/views/login.rs b/src/app/views/login.rs
@@ -135,13 +135,12 @@ impl Component for Login {
let mut homeserver_classes = "login-input";
let mut mxid_classes = "login-input";
let mut password_classes = "login-input";
- match self.state.error_field.as_ref() {
- Some(v) => match v {
+ if let Some(v) = self.state.error_field.as_ref() {
+ match v {
Field::Homeserver => homeserver_classes = "login-input uk-form-danger",
Field::MXID => mxid_classes = "login-input uk-form-danger",
Field::Password => password_classes = "login-input uk-form-danger",
- },
- _ => {}
+ }
}
if self.state.loading {
diff --git a/src/app/views/main_view.rs b/src/app/views/main_view.rs
@@ -67,32 +67,31 @@ impl Component for MainView {
</div>
</div>
}
- } else {
- if self.state.current_room.as_ref().unwrap().is_encrypted() {
- html! {
- <div class="uk-flex auto-scrollable-container" style="height: 100%">
- <RoomList change_room_callback=self.link.callback(Msg::ChangeRoom)/>
- <div class="container uk-flex uk-flex-column uk-width-5-6 uk-padding uk-padding-remove-bottom" style="height: 100%">
- <h1>{ self.state.current_room.as_ref().unwrap().display_name() }</h1>
- <h4>
- {
- tr!(
- // A warning for encrypted rooms
- "Daydream currently does not support encryption."
- )
- }
- </h4>
- </div>
- </div>
- }
- } else {
- html! {
- <div class="uk-flex auto-scrollable-container" style="height: 100%">
- <RoomList change_room_callback=self.link.callback(Msg::ChangeRoom)/>
- <EventList current_room=self.state.current_room.as_ref().unwrap() />
+ } else if self.state.current_room.as_ref().unwrap().is_encrypted() {
+ html! {
+ <div class="uk-flex auto-scrollable-container" style="height: 100%">
+ <RoomList change_room_callback=self.link.callback(Msg::ChangeRoom)/>
+ <div class="container uk-flex uk-flex-column uk-width-5-6 uk-padding uk-padding-remove-bottom" style="height: 100%">
+ <h1>{ self.state.current_room.as_ref().unwrap().display_name() }</h1>
+ <h4>
+ {
+ tr!(
+ // A warning for encrypted rooms
+ "Daydream currently does not support encryption."
+ )
+ }
+ </h4>
</div>
- }
+ </div>
+ }
+ } else {
+ html! {
+ <div class="uk-flex auto-scrollable-container" style="height: 100%">
+ <RoomList change_room_callback=self.link.callback(Msg::ChangeRoom)/>
+ <EventList current_room=self.state.current_room.as_ref().unwrap() />
+ </div>
}
}
}
}
+
