Skip to content

Commit e346a98

Browse files
committed
style: switch to rustfmt
1 parent 368dc64 commit e346a98

File tree

13 files changed

+468
-304
lines changed

13 files changed

+468
-304
lines changed

examples/btree_set_range.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ fn check_range(set: BTreeSet<i32>, range: RangeAny<i32>) -> TestResult {
4444
TestResult::discard()
4545
} else {
4646
let xs: BTreeSet<_> = set.range(range).cloned().collect();
47-
TestResult::from_bool(set.iter().all(|x| range.contains(x) == xs.contains(x)))
47+
TestResult::from_bool(
48+
set.iter().all(|x| range.contains(x) == xs.contains(x)),
49+
)
4850
}
4951
}
5052

examples/out_of_bounds.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
extern crate quickcheck;
22

3-
use quickcheck::{TestResult, quickcheck};
3+
use quickcheck::{quickcheck, TestResult};
44

55
fn main() {
66
fn prop(length: usize, index: usize) -> TestResult {
77
let v: Vec<_> = (0..length).collect();
88
if index < length {
99
TestResult::discard()
1010
} else {
11-
TestResult::must_fail(move || {
12-
v[index]
13-
})
11+
TestResult::must_fail(move || v[index])
1412
}
1513
}
1614
quickcheck(prop as fn(usize, usize) -> TestResult);

examples/reverse.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ extern crate quickcheck;
33
use quickcheck::quickcheck;
44

55
fn reverse<T: Clone>(xs: &[T]) -> Vec<T> {
6-
let mut rev = vec!();
6+
let mut rev = vec![];
77
for x in xs {
88
rev.insert(0, x.clone())
99
}

examples/reverse_single.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
extern crate quickcheck;
22

3-
use quickcheck::{TestResult, quickcheck};
3+
use quickcheck::{quickcheck, TestResult};
44

55
fn reverse<T: Clone>(xs: &[T]) -> Vec<T> {
6-
let mut rev = vec!();
6+
let mut rev = vec![];
77
for x in xs {
88
rev.insert(0, x.clone())
99
}
@@ -13,7 +13,7 @@ fn reverse<T: Clone>(xs: &[T]) -> Vec<T> {
1313
fn main() {
1414
fn prop(xs: Vec<isize>) -> TestResult {
1515
if xs.len() != 1 {
16-
return TestResult::discard()
16+
return TestResult::discard();
1717
}
1818
TestResult::from_bool(xs == reverse(&*xs))
1919
}

examples/sieve.rs

+8-7
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,24 @@ fn sieve(n: usize) -> Vec<usize> {
77
return vec![];
88
}
99

10-
let mut marked = vec![false; n+1];
10+
let mut marked = vec![false; n + 1];
1111
marked[0] = true;
1212
marked[1] = true;
1313
marked[2] = true;
1414
for p in 2..n {
15-
for i in (2*p..n).filter(|&n| n % p == 0) {
15+
for i in (2 * p..n).filter(|&n| n % p == 0) {
1616
marked[i] = true;
1717
}
1818
}
19-
marked.iter()
20-
.enumerate()
21-
.filter_map(|(i, &m)| if m { None } else { Some(i) })
22-
.collect()
19+
marked
20+
.iter()
21+
.enumerate()
22+
.filter_map(|(i, &m)| if m { None } else { Some(i) })
23+
.collect()
2324
}
2425

2526
fn is_prime(n: usize) -> bool {
26-
n != 0 && n != 1 && (2..).take_while(|i| i*i <= n).all(|i| n % i != 0)
27+
n != 0 && n != 1 && (2..).take_while(|i| i * i <= n).all(|i| n % i != 0)
2728
}
2829

2930
fn main() {

examples/sort.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fn larger_than<T: Clone + Ord>(xs: &[T], pivot: &T) -> Vec<T> {
1414
}
1515

1616
fn sortk<T: Clone + Ord>(x: &T, xs: &[T]) -> Vec<T> {
17-
let mut result : Vec<T> = sort(&*smaller_than(xs, x));
17+
let mut result: Vec<T> = sort(&*smaller_than(xs, x));
1818
let last_part = sort(&*larger_than(xs, x));
1919
result.push(x.clone());
2020
result.extend(last_part.iter().map(|x| x.clone()));
@@ -33,7 +33,7 @@ fn main() {
3333
fn is_sorted(xs: Vec<isize>) -> bool {
3434
for win in xs.windows(2) {
3535
if win[0] > win[1] {
36-
return false
36+
return false;
3737
}
3838
}
3939
true

quickcheck_macros/examples/attribute.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ extern crate quickcheck_macros;
66
use quickcheck_macros::quickcheck;
77

88
fn reverse<T: Clone>(xs: &[T]) -> Vec<T> {
9-
let mut rev = vec!();
9+
let mut rev = vec![];
1010
for x in xs {
1111
rev.insert(0, x.clone())
1212
}

quickcheck_macros/src/lib.rs

+14-13
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ use proc_macro::TokenStream;
99
use quote::quote;
1010
use syn::{
1111
parse::{Parse, Parser},
12-
spanned::Spanned,
1312
parse_quote,
13+
spanned::Spanned,
1414
};
1515

16-
1716
#[proc_macro_attribute]
1817
pub fn quickcheck(_args: TokenStream, input: TokenStream) -> TokenStream {
1918
let output = match syn::Item::parse.parse(input.clone()) {
@@ -24,13 +23,11 @@ pub fn quickcheck(_args: TokenStream, input: TokenStream) -> TokenStream {
2423
item_fn.decl.inputs.iter().for_each(|input| match *input {
2524
syn::FnArg::Captured(syn::ArgCaptured { ref ty, .. }) => {
2625
inputs.push(parse_quote!(_: #ty));
27-
},
28-
_ => {
29-
errors.push(syn::parse::Error::new(
30-
input.span(),
31-
"unsupported kind of function argument",
32-
))
33-
},
26+
}
27+
_ => errors.push(syn::parse::Error::new(
28+
input.span(),
29+
"unsupported kind of function argument",
30+
)),
3431
});
3532

3633
if errors.is_empty() {
@@ -56,9 +53,12 @@ pub fn quickcheck(_args: TokenStream, input: TokenStream) -> TokenStream {
5653
}
5754
}
5855
} else {
59-
errors.iter().map(syn::parse::Error::to_compile_error).collect()
56+
errors
57+
.iter()
58+
.map(syn::parse::Error::to_compile_error)
59+
.collect()
6060
}
61-
},
61+
}
6262
Ok(syn::Item::Static(mut item_static)) => {
6363
let attrs = mem::replace(&mut item_static.attrs, Vec::new());
6464
let name = &item_static.ident;
@@ -71,10 +71,11 @@ pub fn quickcheck(_args: TokenStream, input: TokenStream) -> TokenStream {
7171
::quickcheck::quickcheck(#name)
7272
}
7373
}
74-
},
74+
}
7575
_ => {
7676
let span = proc_macro2::TokenStream::from(input).span();
77-
let msg = "#[quickcheck] is only supported on statics and functions";
77+
let msg =
78+
"#[quickcheck] is only supported on statics and functions";
7879

7980
syn::parse::Error::new(span, msg).to_compile_error()
8081
}

rustfmt.toml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
max_width = 79
2+
use_small_heuristics = "max"

0 commit comments

Comments
 (0)