Skip to content

Commit fbba8d4

Browse files
avacore1337avacore1337
committed
clippy feedback
1 parent 1bb8177 commit fbba8d4

File tree

9 files changed

+38
-46
lines changed

9 files changed

+38
-46
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
2323

2424
If it doesn't compile you might need to install our currently used nightly version:
2525
```bash
26-
rustup toolchain install nightly-2020-07-08
26+
rustup toolchain install nightly-2021-05-11
2727
```
2828
2929

‎src/auth.rs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pub fn validate_auth(
4545
match auth_level {
4646
AuthLevel::Any => Ok(auth),
4747
AuthLevel::Assistant => {
48-
let queue_name = queue_name.ok_or_else(|| BadAuth)?;
48+
let queue_name = queue_name.ok_or(BadAuth)?;
4949
match db::admins::admin_for_queue(conn, &queue_name, &auth) {
5050
Some(_) => Ok(auth),
5151
None => Err(Box::new(BadAuth)),
@@ -61,7 +61,7 @@ pub fn validate_auth(
6161
AuthLevel::SuperOrTeacher => match db::super_admins::is_super(conn, auth.id) {
6262
Some(_) => Ok(auth),
6363
None => {
64-
let queue_name = queue_name.ok_or_else(|| BadAuth)?;
64+
let queue_name = queue_name.ok_or(BadAuth)?;
6565
match db::admins::admin_for_queue(conn, &queue_name, &auth) {
6666
Some(AdminEnum::Teacher) => Ok(auth),
6767
_ => Err(Box::new(BadAuth)),
@@ -131,11 +131,7 @@ fn extract_auth_from_request(request: &Request, secret: &[u8]) -> Option<Auth> {
131131
}
132132

133133
fn extract_token_from_header(header: &str) -> Option<&str> {
134-
if header.starts_with(config::TOKEN_PREFIX) {
135-
Some(&header[config::TOKEN_PREFIX.len()..])
136-
} else {
137-
None
138-
}
134+
header.strip_prefix(config::TOKEN_PREFIX)
139135
}
140136

141137
/// Decode token into `Auth` struct. If any error is encountered, log it

‎src/config.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ use std::collections::HashMap;
55
use std::env;
66

77
/// Debug only secret for JWT encoding & decoding.
8-
const SECRET: &'static str = "8Xui8SN4mI+7egV/9dlfYYLGQJeEx4+DwmSQLwDVXJg=";
8+
const SECRET: &str = "8Xui8SN4mI+7egV/9dlfYYLGQJeEx4+DwmSQLwDVXJg=";
99

1010
/// js toISOString() in test suit can't handle chrono's default precision
1111
// pub const DATE_FORMAT: &'static str = "%Y-%m-%dT%H:%M:%S%.3fZ";
1212

13-
pub const TOKEN_PREFIX: &'static str = "Token ";
13+
pub const TOKEN_PREFIX: &str = "Token ";
1414

1515
pub struct AppState {
1616
pub secret: Vec<u8>,

‎src/lib.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ extern crate rocket;
88

99
#[macro_use]
1010
extern crate rocket_contrib;
11-
use rocket_cors;
1211

1312
#[macro_use]
1413
extern crate diesel;

‎src/main.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
use queuesystem;
2-
31
fn main() {
42
queuesystem::rocket().launch();
53
}

‎src/models/user.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ impl User {
6060
username: &self.username,
6161
ugkthid: &self.ugkthid,
6262
realname: &self.realname,
63-
location: location,
63+
location,
6464
superadmin,
6565
assistant_in,
6666
teacher_in,

‎src/util.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ pub fn get_location(client_addr: &ClientAddr) -> Option<String> {
162162
None
163163
} else {
164164
let kth_subname = host
165-
.split(".")
165+
.split('.')
166166
.next()
167167
.unwrap()
168168
.replace("-", " ")

‎src/wsroutes/routes.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ pub fn join_queue_route(
330330
println!("QueueEntry {:?}", queue_entry);
331331

332332
let sendable = queue_entry.to_sendable(conn);
333-
handler.broadcast_room(queue_name, "joinQueue", json!(sendable.clone()));
333+
handler.broadcast_room(queue_name, "joinQueue", json!(sendable));
334334
handler.broadcast_lobby(&queue.name, "joinQueue", json!(sendable));
335335
Ok(())
336336
}

‎src/wsroutes/ws_rs.rs‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ impl Handler for RoomHandler {
4545
// https://ws-rs.org/api_docs/ws/struct.Request.html
4646
println!("Browser Request from {:?}", req.origin().unwrap().unwrap());
4747
println!("Client found is {:?}", req.client_addr().unwrap());
48-
let resp = Response::from_request(req);
49-
resp
48+
Response::from_request(req)
5049
}
5150

5251
_ => Ok(Response::new(404, "Not Found", b"404 - Not Found".to_vec())),
@@ -67,7 +66,7 @@ impl Handler for RoomHandler {
6766

6867
// Handle messages received in the websocket (in this case, only on /ws)
6968
fn on_message(&mut self, message: Message) -> ws::Result<()> {
70-
let raw_message = message.clone().into_text()?;
69+
let raw_message = message.into_text()?;
7170
println!("The message from the client is {:#?}", &raw_message);
7271
if let Err(e) = self.handle_message(&raw_message) {
7372
self.send_error_message(e, &raw_message);
@@ -169,7 +168,7 @@ impl RoomHandler {
169168
pub fn send_self(&self, path: &str, content: Json) {
170169
let message = &json!(SendWrapper {
171170
path: path.to_string(),
172-
content: content,
171+
content,
173172
})
174173
.to_string();
175174
if let Err(err) = self.out.send(Message::Text(message.to_string())) {
@@ -181,7 +180,7 @@ impl RoomHandler {
181180
println!("broadcasting to entire server");
182181
let message = &json!(SendWrapper {
183182
path: "message".to_string(),
184-
content: content,
183+
content,
185184
})
186185
.to_string();
187186
if let Err(err) = self.out.broadcast(Message::Text(message.to_string())) {
@@ -197,7 +196,7 @@ impl RoomHandler {
197196
let internal_name = "room_".to_string() + room;
198197
let message = &json!(SendWrapper {
199198
path: path.to_string() + "/" + room,
200-
content: content,
199+
content,
201200
})
202201
.to_string();
203202
let mut rooms: RefMut<_> = self.rooms.borrow_mut();
@@ -225,7 +224,7 @@ impl RoomHandler {
225224
println!("broadcasting to lobby");
226225
let message = &json!(SendWrapper {
227226
path: path.to_string() + "/" + room,
228-
content: content,
227+
content,
229228
})
230229
.to_string();
231230
let mut rooms: RefMut<_> = self.rooms.borrow_mut();
@@ -298,17 +297,17 @@ impl RoomHandler {
298297

299298
["updateQueueEntry", queue_name] => {
300299
let auth = self.get_auth(&wrapper, AuthLevel::Any)?;
301-
let join_queue = from_value::<UpdateQueueEntry>(wrapper.content.clone())?;
300+
let join_queue = from_value::<UpdateQueueEntry>(wrapper.content)?;
302301
update_queue_entry_route(self, auth, conn, join_queue, queue_name)
303302
}
304303
["sendMessage", queue_name] => {
305304
let auth = self.get_auth(&wrapper, AuthLevel::Assistant)?;
306-
let user_message = from_value::<UserMessage>(wrapper.content.clone())?;
305+
let user_message = from_value::<UserMessage>(wrapper.content)?;
307306
send_message_route(self, auth, user_message, queue_name)
308307
}
309308
["joinQueue", queue_name] => {
310309
let auth = self.get_auth(&wrapper, AuthLevel::Any)?;
311-
let join_queue = from_value::<UpdateQueueEntry>(wrapper.content.clone())?;
310+
let join_queue = from_value::<UpdateQueueEntry>(wrapper.content)?;
312311
join_queue_route(self, auth, conn, join_queue, queue_name)
313312
}
314313
["leaveQueue", queue_name] => {
@@ -325,97 +324,97 @@ impl RoomHandler {
325324
}
326325
["renameQueue", queue_name] => {
327326
let _auth = self.get_auth(&wrapper, AuthLevel::Super)?;
328-
let rename_queue = from_value::<RenameQueue>(wrapper.content.clone())?;
327+
let rename_queue = from_value::<RenameQueue>(wrapper.content)?;
329328
rename_queue_route(self, conn, rename_queue, queue_name)
330329
}
331330
["addSuperAdmin"] => {
332331
let _auth = self.get_auth(&wrapper, AuthLevel::Super)?;
333-
let user = from_value::<Username>(wrapper.content.clone())?;
332+
let user = from_value::<Username>(wrapper.content)?;
334333
add_super_admin_route(self, conn, user)
335334
}
336335
["removeSuperAdmin"] => {
337336
let _auth = self.get_auth(&wrapper, AuthLevel::Super)?;
338-
let user = from_value::<Username>(wrapper.content.clone())?;
337+
let user = from_value::<Username>(wrapper.content)?;
339338
remove_super_route(self, conn, user)
340339
}
341340
["setHelpStatus", queue_name] => {
342341
let auth = self.get_auth(&wrapper, AuthLevel::Any)?;
343-
let status = from_value::<Status>(wrapper.content.clone())?;
342+
let status = from_value::<Status>(wrapper.content)?;
344343
set_help_status_route(self, auth, conn, status, queue_name)
345344
}
346345
["kick", queue_name] => {
347346
let _auth = self.get_auth(&wrapper, AuthLevel::Assistant)?;
348-
let kick = from_value::<Ugkthid>(wrapper.content.clone())?;
347+
let kick = from_value::<Ugkthid>(wrapper.content)?;
349348
kick_route(self, conn, kick, queue_name)
350349
}
351350
["setQueueInfo", queue_name] => {
352351
let _auth = self.get_auth(&wrapper, AuthLevel::Assistant)?;
353-
let text = from_value::<Text>(wrapper.content.clone())?;
352+
let text = from_value::<Text>(wrapper.content)?;
354353
set_queue_info_route(self, conn, text, queue_name)
355354
}
356355
["addTeacher", queue_name] => {
357356
let _auth = self.get_auth(&wrapper, AuthLevel::SuperOrTeacher)?;
358-
let user = from_value::<Username>(wrapper.content.clone())?;
357+
let user = from_value::<Username>(wrapper.content)?;
359358
add_teacher_route(self, conn, user, queue_name)
360359
}
361360
["addAssistant", queue_name] => {
362361
let _auth = self.get_auth(&wrapper, AuthLevel::SuperOrTeacher)?;
363-
let user = from_value::<Username>(wrapper.content.clone())?;
362+
let user = from_value::<Username>(wrapper.content)?;
364363
add_assistant_route(self, conn, user, queue_name)
365364
}
366365
["removeTeacher", queue_name] => {
367366
let _auth = self.get_auth(&wrapper, AuthLevel::SuperOrTeacher)?;
368-
let user = from_value::<Username>(wrapper.content.clone())?;
367+
let user = from_value::<Username>(wrapper.content)?;
369368
remove_teacher_route(self, conn, user, queue_name)
370369
}
371370
["removeAssistant", queue_name] => {
372371
let _auth = self.get_auth(&wrapper, AuthLevel::SuperOrTeacher)?;
373-
let user = from_value::<Username>(wrapper.content.clone())?;
372+
let user = from_value::<Username>(wrapper.content)?;
374373
remove_assistant_route(self, conn, user, queue_name)
375374
}
376375
["setUserHelpStatus", queue_name] => {
377376
let _auth = self.get_auth(&wrapper, AuthLevel::Assistant)?;
378-
let user_status = from_value::<UserStatus>(wrapper.content.clone())?;
377+
let user_status = from_value::<UserStatus>(wrapper.content)?;
379378
set_user_help_status_route(self, conn, user_status, queue_name)
380379
}
381380
["broadcast", queue_name] => {
382381
let auth = self.get_auth(&wrapper, AuthLevel::Assistant)?;
383-
let message = from_value::<Text>(wrapper.content.clone())?;
382+
let message = from_value::<Text>(wrapper.content)?;
384383
broadcast_route(self, auth, message, queue_name)
385384
}
386385
["broadcastFaculty", queue_name] => {
387386
let auth = self.get_auth(&wrapper, AuthLevel::Assistant)?;
388-
let message = from_value::<Text>(wrapper.content.clone())?;
387+
let message = from_value::<Text>(wrapper.content)?;
389388
broadcast_faculty_route(self, auth, conn, message, queue_name)
390389
}
391390
["broadcastServer"] => {
392391
let _auth = self.get_auth(&wrapper, AuthLevel::Super)?;
393-
let message = from_value::<Text>(wrapper.content.clone())?;
392+
let message = from_value::<Text>(wrapper.content)?;
394393
self.broadcast_server(json!(message));
395394
Ok(())
396395
}
397396
["badLocation", queue_name] => {
398397
let auth = self.get_auth(&wrapper, AuthLevel::Assistant)?;
399-
let ugkthid = from_value::<BadLocationMessage>(wrapper.content.clone())?;
398+
let ugkthid = from_value::<BadLocationMessage>(wrapper.content)?;
400399
bad_location_route(self, auth, ugkthid, conn, queue_name)
401400
}
402401
["setMOTD", queue_name] => {
403402
let _auth = self.get_auth(&wrapper, AuthLevel::Assistant)?;
404-
let text = from_value::<Text>(wrapper.content.clone())?;
403+
let text = from_value::<Text>(wrapper.content)?;
405404
set_queue_motd_route(self, conn, text, queue_name)
406405
}
407406
["purgeQueue", queue_name] => {
408407
let _auth = self.get_auth(&wrapper, AuthLevel::Assistant)?;
409408
purge_queue_route(self, conn, queue_name)
410409
}
411410
["setQueueLockStatus", queue_name] => {
412-
let status = from_value::<Status>(wrapper.content.clone())?;
413411
let _auth = self.get_auth(&wrapper, AuthLevel::Assistant)?;
412+
let status = from_value::<Status>(wrapper.content)?;
414413
set_queue_lock_status(self, conn, status, queue_name)
415414
}
416415
["setQueueHideStatus", queue_name] => {
417-
let status = from_value::<Status>(wrapper.content.clone())?;
418416
let _auth = self.get_auth(&wrapper, AuthLevel::SuperOrTeacher)?;
417+
let status = from_value::<Status>(wrapper.content)?;
419418
set_queue_hide_status(self, conn, status, queue_name)
420419
}
421420
_ => {
@@ -426,7 +425,7 @@ impl RoomHandler {
426425
}
427426
}
428427

429-
pub fn websocket() -> () {
428+
pub fn websocket() {
430429
let port = if cfg!(debug_assertions) { 7777 } else { 7000 };
431430
println!(
432431
"Web Socket RoomHandler is ready at ws://127.0.0.1:{}/ws",
@@ -447,7 +446,7 @@ pub fn websocket() -> () {
447446
..Settings::default()
448447
})
449448
.build(|out| RoomHandler {
450-
out: out,
449+
out,
451450
count: count.clone(),
452451
rooms: rooms.clone(),
453452
ugkthid_map: ugkthid_map.clone(),

0 commit comments

Comments
 (0)