Skip to content

Commit 9a11913

Browse files
alepezalepez
committed
Fix with clippy
1 parent 7295541 commit 9a11913

21 files changed

+52
-57
lines changed

‎devand-core/src/affinity.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ impl MatchingLanguages {
9191
let aff = LanguageAffinity::new(a, b);
9292
(lang, aff)
9393
})
94-
.max_by(|(_, l), (_, r)| l.cmp(&r))
94+
.max_by(|(_, l), (_, r)| l.cmp(r))
9595
.map(|(&lang, aff)| (lang, aff))
9696
}
9797

@@ -297,7 +297,7 @@ mod tests {
297297
fn find_matching_languages_none() {
298298
let languages = Languages::default();
299299
let a = languages.clone();
300-
let b = languages.clone();
300+
let b = languages;
301301

302302
let matching = find_matching_languages(&a, &b);
303303

‎devand-core/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ impl Languages {
9797
pub fn union(&self, other: &Self) -> Vec<Language> {
9898
let mine: BTreeSet<_> = self.keys_with_priority().collect();
9999
let theirs: BTreeSet<_> = other.keys_with_priority().collect();
100-
mine.union(&theirs).map(|x| *x).collect()
100+
mine.union(&theirs).copied().collect()
101101
}
102102

103103
pub fn intersection(&self, other: &Self) -> Vec<Language> {
104104
let mine: BTreeSet<_> = self.keys_with_priority().collect();
105105
let theirs: BTreeSet<_> = other.keys_with_priority().collect();
106-
mine.intersection(&theirs).map(|x| *x).collect()
106+
mine.intersection(&theirs).copied().collect()
107107
}
108108

109109
fn keys_with_priority(&self) -> impl Iterator<Item = Language> + '_ {

‎devand-core/src/schedule.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ mod tests {
119119
fn hourly_schedule_from_comma_separated_list() {
120120
let s = "5,7,21";
121121
let schedule = DaySchedule::try_from(s).unwrap();
122-
assert!(schedule.hours[4] == false);
123-
assert!(schedule.hours[5] == true);
124-
assert!(schedule.hours[6] == false);
125-
assert!(schedule.hours[7] == true);
126-
assert!(schedule.hours[21] == true);
127-
assert!(schedule.hours[22] == false);
122+
assert!(!schedule.hours[4]);
123+
assert!(schedule.hours[5]);
124+
assert!(!schedule.hours[6]);
125+
assert!(schedule.hours[7]);
126+
assert!(schedule.hours[21]);
127+
assert!(!schedule.hours[22]);
128128
}
129129
}

‎devand-core/src/schedule_matcher.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -455,12 +455,12 @@ mod tests {
455455
let matrix = DayScheduleMatrix::from(params);
456456

457457
assert!(matrix.data.len() == expected_len);
458-
assert!(matrix[&(UserId(0), Hour(1))] == true);
459-
assert!(matrix[&(UserId(2), Hour(3))] == true);
460-
assert!(matrix[&(UserId(2), Hour(5))] == true);
461-
assert!(matrix[&(UserId(2), Hour(1))] == false);
462-
assert!(matrix[&(UserId(1), Hour(5))] == false);
463-
assert!(matrix[&(UserId(3), Hour(6))] == false);
458+
assert!(matrix[&(UserId(0), Hour(1))]);
459+
assert!(matrix[&(UserId(2), Hour(3))]);
460+
assert!(matrix[&(UserId(2), Hour(5))]);
461+
assert!(!matrix[&(UserId(2), Hour(1))]);
462+
assert!(!matrix[&(UserId(1), Hour(5))]);
463+
assert!(!matrix[&(UserId(3), Hour(6))]);
464464

465465
assert!(matrix.get_available_at_hour(Hour(1)) == vec![UserId(0), UserId(1)]);
466466
assert!(matrix.get_available_at_hour(Hour(3)) == vec![UserId(1), UserId(2), UserId(3)]);

‎devand-crypto/src/signed_token.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub trait Signable {
1818
where
1919
Self: serde::de::DeserializeOwned + std::marker::Sized,
2020
{
21-
decoder.decode(&token)
21+
decoder.decode(token)
2222
}
2323
}
2424

‎devand-db/src/auth.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fn encode_password(password: &str) -> String {
1919

2020
fn verify_password(hash: &str, password: &str) -> bool {
2121
let password = password.as_bytes();
22-
argon2::verify_encoded(&hash, password).unwrap()
22+
argon2::verify_encoded(hash, password).unwrap()
2323
}
2424

2525
pub struct Credentials {
@@ -89,7 +89,7 @@ pub fn check_password(user_id: UserId, password: &str, conn: &PgConnection) -> R
8989
.select(schema::auth::enc_password)
9090
.first(conn)
9191
.map_err(|_| Error::Unknown)?;
92-
Ok(verify_password(&enc_password, &password))
92+
Ok(verify_password(&enc_password, password))
9393
}
9494

9595
fn add_password(

‎devand-db/src/fake_data.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ impl OneUser {
1818
password: password.clone(),
1919
};
2020

21-
let user = super::auth::join(join_data, &conn).unwrap();
21+
let user = super::auth::join(join_data, conn).unwrap();
2222

2323
Self { user, password }
2424
}

‎devand-db/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ pub fn save_user(user: devand_core::User, conn: &PgConnection) -> Option<devand_
100100

101101
let settings = serde_json::to_value(settings).unwrap();
102102

103-
let (current_email, current_email_verified) = has_verified_email(user.id, &conn).ok()?;
103+
let (current_email, current_email_verified) = has_verified_email(user.id, conn).ok()?;
104104

105105
let email_changed = current_email != email;
106106
let email_verified = current_email_verified && !email_changed;
@@ -628,7 +628,7 @@ mod tests {
628628
fn save_user_change_email_unverified() {
629629
let (conn, user) = fresh_db_with_fake_user();
630630
let user_id = user.id;
631-
let email = user.email.clone();
631+
let email = user.email;
632632

633633
set_verified_email(&email, &conn).unwrap();
634634

‎devand-mailer/src/client.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ impl Client {
3232

3333
let client_url = &self.url;
3434
let client = rt
35-
.block_on(http::connect::<GenClient>(&client_url))
35+
.block_on(http::connect::<GenClient>(client_url))
3636
.map_err(|_| Error::Unknown)?;
3737

3838
client
@@ -56,7 +56,7 @@ impl Client {
5656

5757
let client_url = &self.url;
5858
let client = rt
59-
.block_on(http::connect::<GenClient>(&client_url))
59+
.block_on(http::connect::<GenClient>(client_url))
6060
.map_err(|_| Error::Unknown)?;
6161

6262
client

‎devand-ui/src/app.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ impl App {
143143
html! {
144144
<>
145145
{ view_menu(&self.state) }
146-
{ self.view_routes(&user) }
146+
{ self.view_routes(user) }
147147
</>
148148
}
149149
}
@@ -183,13 +183,13 @@ fn view_menu(state: &State) -> Html {
183183
..
184184
} = state;
185185
html! {
186-
<ul class=("devand-menu")>
187-
<li class=("devand-menu-item")><RouterAnchor route=AppRoute::Settings classes="pure-menu-link" >{ Text::Settings }</RouterAnchor></li>
188-
<li class=("devand-menu-item")><RouterAnchor route=AppRoute::Affinities classes="pure-menu-link" >{ Text::Affinities }</RouterAnchor></li>
189-
<li class=("devand-menu-item")><RouterAnchor route=AppRoute::CodeNow classes="pure-menu-link" >{ view_code_now(*online_users) }</RouterAnchor></li>
190-
<li class=("devand-menu-item")><RouterAnchor route=AppRoute::Schedule classes="pure-menu-link" >{ Text::Schedule }</RouterAnchor></li>
191-
<li class=("devand-menu-item")><RouterAnchor route=AppRoute::SecuritySettings classes="pure-menu-link" >{ Text::Security }</RouterAnchor></li>
192-
<li class=("devand-menu-item")><RouterAnchor route=AppRoute::Chats classes="pure-menu-link" >{ view_messages(*unread_messages) }</RouterAnchor></li>
186+
<ul class="devand-menu">
187+
<li class="devand-menu-item"><RouterAnchor route=AppRoute::Settings classes="pure-menu-link" >{ Text::Settings }</RouterAnchor></li>
188+
<li class="devand-menu-item"><RouterAnchor route=AppRoute::Affinities classes="pure-menu-link" >{ Text::Affinities }</RouterAnchor></li>
189+
<li class="devand-menu-item"><RouterAnchor route=AppRoute::CodeNow classes="pure-menu-link" >{ view_code_now(*online_users) }</RouterAnchor></li>
190+
<li class="devand-menu-item"><RouterAnchor route=AppRoute::Schedule classes="pure-menu-link" >{ Text::Schedule }</RouterAnchor></li>
191+
<li class="devand-menu-item"><RouterAnchor route=AppRoute::SecuritySettings classes="pure-menu-link" >{ Text::Security }</RouterAnchor></li>
192+
<li class="devand-menu-item"><RouterAnchor route=AppRoute::Chats classes="pure-menu-link" >{ view_messages(*unread_messages) }</RouterAnchor></li>
193193
</ul>
194194
}
195195
}

‎devand-ui/src/app/components/affinities_table.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ impl AffinitiesTable {
9090
<div class="pure-u-1 pure-u-sm-1-2">
9191
<label for="add_language">{ "Filter by Language" }</label>
9292
<select name="add_language" onchange=on_change class="pure-u-1">
93-
<option value="" selected=(selected_language.is_none())></option>
93+
<option value="" selected=selected_language.is_none()></option>
9494
{ for language_options }
9595
</select>
9696
</div>
@@ -111,7 +111,7 @@ impl AffinitiesTable {
111111
true
112112
}
113113
})
114-
.map(|a| view_affinity(a));
114+
.map(view_affinity);
115115
html! {
116116
<ul class="devand-user-affinities">
117117
{ for affinities}
@@ -124,7 +124,7 @@ fn view_affinity(user_affinity: &UserAffinity) -> Html {
124124
let languages = user_affinity.user.languages.clone().into_sorted_vec();
125125

126126
let languages_tags = languages.iter().map(|(lang, pref)| {
127-
html! { <LanguageTag lang=lang.clone() pref=pref.clone() /> }
127+
html! { <LanguageTag lang=*lang pref=pref.clone() /> }
128128
});
129129

130130
html! {

‎devand-ui/src/app/components/chat_page.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ fn view_bubble(me: UserId, msg: &ChatMessage) -> Html {
191191
};
192192
html! {
193193
<div class=("devand-chat-message-bubble", from_me_class)>
194-
<span class=("devand-chat-message-txt")>{ &msg.txt }</span>
195-
<span class=("devand-timestamp")>{ view_timestamp(&msg.created_at) }</span>
194+
<span class="devand-chat-message-txt">{ &msg.txt }</span>
195+
<span class="devand-timestamp">{ view_timestamp(&msg.created_at) }</span>
196196
</div>
197197
}
198198
}

‎devand-ui/src/app/components/chats_page.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ fn view_chats(chats: &UserChats) -> Html {
8484
.iter()
8585
.rev()
8686
.filter(|c| !c.members.is_empty())
87-
.map(|c| view_chat(c));
87+
.map(view_chat);
8888

8989
html! {
9090
<ul class="user-chats pure-table-horizontal">
@@ -109,7 +109,7 @@ fn view_direct_chat(chat: &UserChat) -> Html {
109109
let unread_messages = chat.unread_messages;
110110

111111
html! {
112-
<li class=("user-chat")>
112+
<li class="user-chat">
113113
<span class="visible_name"><RouterAnchor route=AppRoute::Chat(username) >{ visible_name }</RouterAnchor></span>
114114
<CountTag count=unread_messages />
115115
</li>

‎devand-ui/src/app/components/languages.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ impl AddLanguageComponent {
109109
Msg::Nope
110110
}
111111
} )>
112-
<option value="" selected=(selected_language.is_none())></option>
112+
<option value="" selected=selected_language.is_none()></option>
113113
{ for Language::iter().map(|x| {
114-
let selected = (selected_language == Some(x));
114+
let selected = selected_language == Some(x);
115115
html! {
116116
<option value=x.to_string() selected=selected>{ x }</option>
117117
}

‎devand-ui/src/app/components/settings_page.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ impl SettingsPage {
244244
{ for languages_tags }
245245
</div>
246246
<div class="pure-u-1">
247-
<AddLanguageComponent on_add=self.link.callback(move |lang_pref| Msg::AddLanguage(lang_pref))/>
247+
<AddLanguageComponent on_add=self.link.callback(Msg::AddLanguage)/>
248248
</div>
249249
</div>
250250
</fieldset>
@@ -293,7 +293,7 @@ impl SettingsPage {
293293
}
294294

295295
fn view_availability_panel(&self, schedule: &Availability) -> Html {
296-
html! { <AvailabilityTable schedule=schedule.clone() on_change=self.link.callback(move |s: Availability| Msg::UpdateSchedule(s)) /> }
296+
html! { <AvailabilityTable schedule=schedule.clone() on_change=self.link.callback(Msg::UpdateSchedule) /> }
297297
}
298298

299299
fn update_user<F>(&mut self, f: F)

‎devand-ui/src/app/components/user_profile_page.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ impl Component for UserProfilePage {
9191
let languages = languages.clone().into_sorted_vec();
9292

9393
let languages_tags = languages.iter().map(|(lang, pref)| {
94-
html! { <LanguageTag lang=lang.clone() pref=pref.clone() /> }
94+
html! { <LanguageTag lang=*lang pref=pref.clone() /> }
9595
});
9696

9797
html! {
@@ -104,8 +104,8 @@ impl Component for UserProfilePage {
104104
{ for languages_tags }
105105
</div>
106106

107-
{ view_projects(&projects) }
108-
{ view_spoken_languages(&visible_name, &spoken_languages) }
107+
{ view_projects(projects) }
108+
{ view_spoken_languages(visible_name, spoken_languages) }
109109
</>
110110
}
111111
} else {

‎devand-ui/src/app/workers/main_worker/http.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ pub fn request(worker: &mut MainWorker, msg: Request) {
148148
}
149149

150150
Request::LoadAllChats => {
151-
let req = get(&api_url_chats());
151+
let req = get(api_url_chats());
152152
task(worker, req, Response::AllChatsLoaded)
153153
}
154154

‎devand-ui/src/app/workers/main_worker/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ fn make_on_unload_callback(pending: Arc<AtomicBool>) -> Closure<dyn FnMut(Before
216216

217217
let on_unload = Closure::wrap(on_unload);
218218

219-
window.set_onbeforeunload(Some(&on_unload.as_ref().unchecked_ref()));
219+
window.set_onbeforeunload(Some(on_unload.as_ref().unchecked_ref()));
220220

221221
on_unload
222222
}

‎devand-web/src/api.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,7 @@ fn chat_messages_post(
220220
&mut not_limiter,
221221
);
222222

223-
if let Some(new_message) = devand_db::add_chat_message_by_members(&members, author, txt, &conn)
224-
{
225-
Some(Json(vec![new_message]))
226-
} else {
227-
None
228-
}
223+
devand_db::add_chat_message_by_members(&members, author, txt, &conn).map(|new_message| Json(vec![new_message]))
229224
}
230225

231226
/// Retrieve new messages

‎devand-web/src/notifications.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub(crate) fn notify_chat_members(
2727

2828
// Note: if an addres cannot be obtained, error is ignored and email is
2929
// just not sent.
30-
let email_address_from_id = |&user_id| load_user_by_id(user_id, &conn).map(|u| u.email);
30+
let email_address_from_id = |&user_id| load_user_by_id(user_id, conn).map(|u| u.email);
3131

3232
let now = Utc::now();
3333

‎devand-web/src/state/week_availability_matrix.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ pub struct WeekScheduleMatrixCache {
99

1010
impl WeekScheduleMatrixCache {
1111
pub fn get(&self) -> &WeekScheduleMatrix {
12-
&self.data.as_ref().unwrap()
12+
self.data.as_ref().unwrap()
1313
}
1414

1515
pub fn init(&mut self, conn: &diesel::PgConnection) {
1616
// TODO [optimization] load only needed data
17-
let users = devand_db::load_users(&conn).expect("Cannot load users from database");
17+
let users = devand_db::load_users(conn).expect("Cannot load users from database");
1818

1919
let schedules: Vec<_> = users
2020
.into_iter()

0 commit comments

Comments
 (0)