Skip to content

Commit 1fbf838

Browse files
authored
Format with rustfmt (#389)
* Format with rustfmt * Add rustfmt check to CI
1 parent 5e93fa4 commit 1fbf838

27 files changed

Lines changed: 410 additions & 331 deletions

‎azure-pipelines.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ pr: ["master"]
33

44
jobs:
55
# Check formatting
6-
# - template: ci/azure-rustfmt.yml
7-
# parameters:
8-
# name: rustfmt
6+
- template: ci/azure-rustfmt.yml
7+
parameters:
8+
name: rustfmt
9+
rust_version: stable
910

1011
# Apply clippy lints
1112
# - template: ci/azure-clippy.yml
@@ -60,7 +61,7 @@ jobs:
6061
- template: ci/azure-deploy-docs.yml
6162
parameters:
6263
dependsOn:
63-
# - rustfmt
64+
- rustfmt
6465
# - clippy
6566
- stable
6667
- nightly

‎benches/buf.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
extern crate test;
55

6-
use test::Bencher;
76
use bytes::Buf;
7+
use test::Bencher;
88

99
/// Dummy Buf implementation
1010
struct TestBuf {

‎benches/bytes.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
extern crate test;
55

6-
use test::Bencher;
76
use bytes::Bytes;
7+
use test::Bencher;
88

99
#[bench]
1010
fn deref_unique(b: &mut Bencher) {
@@ -42,7 +42,8 @@ fn deref_static(b: &mut Bencher) {
4242

4343
#[bench]
4444
fn clone_static(b: &mut Bencher) {
45-
let bytes = Bytes::from_static("hello world 1234567890 and have a good byte 0987654321".as_bytes());
45+
let bytes =
46+
Bytes::from_static("hello world 1234567890 and have a good byte 0987654321".as_bytes());
4647

4748
b.iter(|| {
4849
for _ in 0..1024 {

‎benches/bytes_mut.rs‎

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
extern crate test;
55

6-
use test::Bencher;
76
use bytes::{BufMut, BytesMut};
7+
use test::Bencher;
88

99
#[bench]
1010
fn alloc_small(b: &mut Bencher) {
@@ -29,7 +29,6 @@ fn alloc_big(b: &mut Bencher) {
2929
})
3030
}
3131

32-
3332
#[bench]
3433
fn deref_unique(b: &mut Bencher) {
3534
let mut buf = BytesMut::with_capacity(4096);
@@ -92,7 +91,9 @@ fn deref_two(b: &mut Bencher) {
9291

9392
#[bench]
9493
fn clone_frozen(b: &mut Bencher) {
95-
let bytes = BytesMut::from(&b"hello world 1234567890 and have a good byte 0987654321"[..]).split().freeze();
94+
let bytes = BytesMut::from(&b"hello world 1234567890 and have a good byte 0987654321"[..])
95+
.split()
96+
.freeze();
9697

9798
b.iter(|| {
9899
for _ in 0..1024 {
@@ -137,7 +138,9 @@ fn fmt_write(b: &mut Bencher) {
137138
b.iter(|| {
138139
let _ = write!(buf, "{}", s);
139140
test::black_box(&buf);
140-
unsafe { buf.set_len(0); }
141+
unsafe {
142+
buf.set_len(0);
143+
}
141144
})
142145
}
143146

@@ -152,7 +155,9 @@ fn bytes_mut_extend(b: &mut Bencher) {
152155
buf.extend(&data);
153156
}
154157
test::black_box(&buf);
155-
unsafe { buf.set_len(0); }
158+
unsafe {
159+
buf.set_len(0);
160+
}
156161
});
157162
}
158163

@@ -169,7 +174,9 @@ fn put_slice_bytes_mut(b: &mut Bencher) {
169174
buf.put_slice(&data);
170175
}
171176
test::black_box(&buf);
172-
unsafe { buf.set_len(0); }
177+
unsafe {
178+
buf.set_len(0);
179+
}
173180
});
174181
}
175182

@@ -184,7 +191,9 @@ fn put_u8_bytes_mut(b: &mut Bencher) {
184191
buf.put_u8(b'x');
185192
}
186193
test::black_box(&buf);
187-
unsafe { buf.set_len(0); }
194+
unsafe {
195+
buf.set_len(0);
196+
}
188197
});
189198
}
190199

@@ -199,7 +208,9 @@ fn put_slice_vec(b: &mut Bencher) {
199208
buf.put_slice(&data);
200209
}
201210
test::black_box(&buf);
202-
unsafe { buf.set_len(0); }
211+
unsafe {
212+
buf.set_len(0);
213+
}
203214
});
204215
}
205216

@@ -214,7 +225,9 @@ fn put_u8_vec(b: &mut Bencher) {
214225
buf.put_u8(b'x');
215226
}
216227
test::black_box(&buf);
217-
unsafe { buf.set_len(0); }
228+
unsafe {
229+
buf.set_len(0);
230+
}
218231
});
219232
}
220233

@@ -229,7 +242,9 @@ fn put_slice_vec_extend(b: &mut Bencher) {
229242
buf.extend_from_slice(&data);
230243
}
231244
test::black_box(&buf);
232-
unsafe { buf.set_len(0); }
245+
unsafe {
246+
buf.set_len(0);
247+
}
233248
});
234249
}
235250

@@ -244,6 +259,8 @@ fn put_u8_vec_push(b: &mut Bencher) {
244259
buf.push(b'x');
245260
}
246261
test::black_box(&buf);
247-
unsafe { buf.set_len(0); }
262+
unsafe {
263+
buf.set_len(0);
264+
}
248265
});
249266
}

‎ci/azure-rustfmt.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
jobs:
2+
# Check formatting
3+
- job: ${{ parameters.name }}
4+
displayName: Check rustfmt
5+
pool:
6+
vmImage: ubuntu-16.04
7+
steps:
8+
- template: azure-install-rust.yml
9+
parameters:
10+
rust_version: ${{ parameters.rust_version }}
11+
- script: |
12+
cargo fmt --all -- --check
13+
displayName: Check formatting

0 commit comments

Comments
 (0)