Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix clippy warnings and errors #1778

Merged
merged 17 commits into from
Apr 22, 2019
Merged

Fix clippy warnings and errors #1778

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9b2bb43
clippy: Fix unused_imports
tesuji Apr 19, 2019
b75c3fd
clippy: Fix let_and_return
tesuji Apr 19, 2019
58b18a6
clippy: Fix single_char_pattern
tesuji Apr 19, 2019
71178b4
clippy: Fix toplevel_ref_arg
tesuji Apr 19, 2019
b6f8f34
clippy: Fix redundant_closure
tesuji Apr 19, 2019
914128f
clippy: Fix print_literal
tesuji Apr 19, 2019
d3f5cb0
clippy: Fix clone_double_ref
tesuji Apr 19, 2019
5c5de71
clippy: Fix useless_let_if_seq
tesuji Apr 19, 2019
2d3b91c
clippy: Fix useless_format
tesuji Apr 19, 2019
a971149
clippy: Fix type_complexity
tesuji Apr 19, 2019
46f6828
clippy: Fix single_match
tesuji Apr 19, 2019
106f673
clippy: Fix redundant_field_names
tesuji Apr 19, 2019
17ffffa
clippy: Fix too_many_arguments
tesuji Apr 19, 2019
823300f
clippy: Fix mutex_atomic
tesuji Apr 19, 2019
f0d14d5
clippy: Fix const_static_lifetime
tesuji Apr 19, 2019
941bf46
Fix unnecessary `ref` and `ref mut`
tesuji Apr 21, 2019
9284671
tests: Use `RefCell::replace` in place of `mem::replace`
tesuji Apr 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions download/tests/download-curl-resume.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#![cfg(feature = "curl-backend")]

use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Mutex;

use url::Url;
Expand Down Expand Up @@ -35,7 +36,7 @@ fn callback_gets_all_data_as_if_the_download_happened_all_at_once() {

let from_url = format!("http://{}", addr).parse().unwrap();

let callback_partial = Mutex::new(false);
let callback_partial = AtomicBool::new(false);
let callback_len = Mutex::new(None);
let received_in_callback = Mutex::new(Vec::new());

Expand All @@ -47,9 +48,8 @@ fn callback_gets_all_data_as_if_the_download_happened_all_at_once() {
Some(&|msg| {
match msg {
Event::ResumingPartialDownload => {
let mut flag = callback_partial.lock().unwrap();
assert!(!*flag);
*flag = true;
assert!(!callback_partial.load(Ordering::SeqCst));
callback_partial.store(true, Ordering::SeqCst);
kinnison marked this conversation as resolved.
Show resolved Hide resolved
}
Event::DownloadContentLengthReceived(len) => {
let mut flag = callback_len.lock().unwrap();
Expand All @@ -68,7 +68,7 @@ fn callback_gets_all_data_as_if_the_download_happened_all_at_once() {
)
.expect("Test download failed");

assert!(*callback_partial.lock().unwrap());
assert!(callback_partial.into_inner());
assert_eq!(*callback_len.lock().unwrap(), Some(5));
let observed_bytes = received_in_callback.into_inner().unwrap();
assert_eq!(observed_bytes, vec![b'1', b'2', b'3', b'4', b'5']);
Expand Down
10 changes: 5 additions & 5 deletions download/tests/download-reqwest-resume.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#![cfg(feature = "reqwest-backend")]

use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Mutex;

use url::Url;
Expand Down Expand Up @@ -35,7 +36,7 @@ fn callback_gets_all_data_as_if_the_download_happened_all_at_once() {

let from_url = format!("http://{}", addr).parse().unwrap();

let callback_partial = Mutex::new(false);
let callback_partial = AtomicBool::new(false);
let callback_len = Mutex::new(None);
let received_in_callback = Mutex::new(Vec::new());

Expand All @@ -47,9 +48,8 @@ fn callback_gets_all_data_as_if_the_download_happened_all_at_once() {
Some(&|msg| {
match msg {
Event::ResumingPartialDownload => {
let mut flag = callback_partial.lock().unwrap();
assert!(!*flag);
*flag = true;
assert!(!callback_partial.load(Ordering::SeqCst));
callback_partial.store(true, Ordering::SeqCst);
kinnison marked this conversation as resolved.
Show resolved Hide resolved
}
Event::DownloadContentLengthReceived(len) => {
let mut flag = callback_len.lock().unwrap();
Expand All @@ -68,7 +68,7 @@ fn callback_gets_all_data_as_if_the_download_happened_all_at_once() {
)
.expect("Test download failed");

assert!(*callback_partial.lock().unwrap());
assert!(callback_partial.into_inner());
assert_eq!(*callback_len.lock().unwrap(), Some(5));
let observed_bytes = received_in_callback.into_inner().unwrap();
assert_eq!(observed_bytes, vec![b'1', b'2', b'3', b'4', b'5']);
Expand Down