Skip to content

Commit db2e45d

Browse files
dekellumdekellum
committed
rustfmt all code
rustfmt 1.4.12-nightly (9f53665 2020-02-10)
1 parent b84dd7e commit db2e45d

17 files changed

Lines changed: 1831 additions & 1637 deletions

File tree

‎marked-cli/build.rs‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,21 @@ fn main() {
1313
if rustv < msrv {
1414
panic!(
1515
"{} v{} {} is {} > {} (this rustc)",
16-
PACKAGE, VERSION, M_V, join(&msrv), join(&rustv));
16+
PACKAGE,
17+
VERSION,
18+
M_V,
19+
join(&msrv),
20+
join(&rustv)
21+
);
1722
}
1823
}
1924

2025
fn join(ver: &[u16]) -> String {
2126
let mut out = String::new();
2227
for v in ver {
23-
if !out.is_empty() { out.push('.'); }
28+
if !out.is_empty() {
29+
out.push('.');
30+
}
2431
out.push_str(&v.to_string());
2532
}
2633
out
@@ -39,9 +46,7 @@ fn rustc_version() -> Vec<u16> {
3946
}
4047
let mut vp = v.split("-");
4148
if let Some(v) = vp.next() {
42-
let vs: Vec<u16> = v.split(".")
43-
.filter_map(|vss| vss.parse().ok())
44-
.collect();
49+
let vs: Vec<u16> = v.split(".").filter_map(|vss| vss.parse().ok()).collect();
4550
if !vs.is_empty() {
4651
return vs;
4752
}

‎marked-cli/src/main.rs‎

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,15 @@
22

33
use std::error::Error as StdError;
44
use std::fmt;
5+
use std::fs::File;
56
use std::io;
67
use std::process;
7-
use std::fs::File;
88

99
use encoding_rs as enc;
1010

11-
use marked::{
12-
chain_filters,
13-
filter,
14-
html::parse_buffered,
15-
logger::setup_logger,
16-
EncodingHint,
17-
};
11+
use marked::{chain_filters, filter, html::parse_buffered, logger::setup_logger, EncodingHint};
1812

19-
use clap::{
20-
crate_version,
21-
Arg, App, AppSettings, SubCommand,
22-
};
13+
use clap::{crate_version, App, AppSettings, Arg, SubCommand};
2314

2415
use log::{debug, error};
2516

@@ -55,8 +46,7 @@ fn run() -> Result<(), Flaw> {
5546
let html = SubCommand::with_name("html")
5647
.setting(AppSettings::DeriveDisplayOrder)
5748
.about("HTML processing")
58-
.after_help(
59-
"Parses input, applies filters, and serializes to output.")
49+
.after_help("Parses input, applies filters, and serializes to output.")
6050
.args(&[
6151
Arg::with_name("output")
6252
.short("o")
@@ -80,7 +70,7 @@ fn run() -> Result<(), Flaw> {
8070
Arg::with_name("file")
8171
.required(false)
8272
.value_name("INPUT-FILE")
83-
.help("File path to read (default: STDIN)")
73+
.help("File path to read (default: STDIN)"),
8474
]);
8575

8676
let app = App::new("marked")
@@ -89,12 +79,14 @@ fn run() -> Result<(), Flaw> {
8979
.setting(AppSettings::SubcommandRequired)
9080
.setting(AppSettings::DeriveDisplayOrder)
9181
.max_term_width(100)
92-
.arg(Arg::with_name("debug")
93-
.short("d")
94-
.long("debug")
95-
.multiple(true)
96-
.help("Enable more logging, and up to `-dddd`")
97-
.global(true))
82+
.arg(
83+
Arg::with_name("debug")
84+
.short("d")
85+
.long("debug")
86+
.multiple(true)
87+
.help("Enable more logging, and up to `-dddd`")
88+
.global(true),
89+
)
9890
.subcommand(html);
9991

10092
let mtch = app.get_matches();
@@ -148,7 +140,9 @@ fn run() -> Result<(), Flaw> {
148140
} else {
149141
quit!(
150142
"input {} same as output {} not supported",
151-
fin.unwrap(), fout);
143+
fin.unwrap(),
144+
fout
145+
);
152146
}
153147
} else {
154148
Box::new(io::stdout())

‎marked/benches/round_trip.rs‎

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,43 @@
11
#![warn(rust_2018_idioms)]
2-
32
#![feature(test)]
43
extern crate test; // Still required, see rust-lang/rust#55133
54

65
use std::default::Default;
7-
use std::io;
86
use std::fs::File;
7+
use std::io;
98

109
use test::Bencher;
1110

1211
use encoding_rs as enc;
1312
use html5ever::driver::ParseOpts;
1413
use html5ever::parse_document;
15-
use markup5ever_rcdom::{SerializableHandle, RcDom};
1614
use html5ever::serialize as rc_serialize;
15+
use markup5ever_rcdom::{RcDom, SerializableHandle};
1716

1817
use marked;
19-
use marked::{Decoder, EncodingHint};
2018
use marked::chain_filters;
2119
use marked::filter;
2220
use marked::html::parse_buffered;
21+
use marked::{Decoder, EncodingHint};
2322

2423
#[bench]
2524
fn b00_round_trip_rcdom(b: &mut Bencher) {
2625
b.iter(|| {
27-
let parser_sink =
28-
parse_document(RcDom::default(), ParseOpts::default());
26+
let parser_sink = parse_document(RcDom::default(), ParseOpts::default());
2927
let decoder = Decoder::new(enc::UTF_8, parser_sink);
30-
let mut fin = sample_file("github-dekellum.html")
31-
.expect("sample_file");
28+
let mut fin = sample_file("github-dekellum.html").expect("sample_file");
3229
let doc = decoder.read_to_end(&mut fin).expect("parse");
3330
let mut out = Vec::with_capacity(273108);
3431
let ser_handle: SerializableHandle = doc.document.clone().into();
35-
rc_serialize(&mut out, &ser_handle, Default::default())
36-
.expect("serialization");
32+
rc_serialize(&mut out, &ser_handle, Default::default()).expect("serialization");
3733
assert_eq!(out.len(), 272273);
3834
});
3935
}
4036

4137
#[bench]
4238
fn b01_round_trip_marked(b: &mut Bencher) {
4339
b.iter(|| {
44-
let mut fin = sample_file("github-dekellum.html")
45-
.expect("sample_file");
40+
let mut fin = sample_file("github-dekellum.html").expect("sample_file");
4641
let eh = EncodingHint::shared_default(enc::UTF_8);
4742
let doc = parse_buffered(eh, &mut fin).expect("parse");
4843
let mut out = Vec::with_capacity(273108);
@@ -54,8 +49,7 @@ fn b01_round_trip_marked(b: &mut Bencher) {
5449
#[bench]
5550
fn b11_decode_eucjp_parse_marked(b: &mut Bencher) {
5651
b.iter(|| {
57-
let mut fin = sample_file("matsunami_eucjp_meta.html")
58-
.expect("sample_file");
52+
let mut fin = sample_file("matsunami_eucjp_meta.html").expect("sample_file");
5953
let eh = EncodingHint::shared_default(enc::UTF_8);
6054
parse_buffered(eh, &mut fin).expect("parse");
6155
});
@@ -64,8 +58,7 @@ fn b11_decode_eucjp_parse_marked(b: &mut Bencher) {
6458
#[bench]
6559
fn b12_decode_windows1251_parse_marked(b: &mut Bencher) {
6660
b.iter(|| {
67-
let mut fin = sample_file("russez_windows1251_meta.html")
68-
.expect("sample_file");
61+
let mut fin = sample_file("russez_windows1251_meta.html").expect("sample_file");
6962
let eh = EncodingHint::shared_default(enc::UTF_8);
7063
parse_buffered(eh, &mut fin).expect("parse");
7164
});
@@ -74,17 +67,15 @@ fn b12_decode_windows1251_parse_marked(b: &mut Bencher) {
7467
#[bench]
7568
fn b13_utf8_parse_marked(b: &mut Bencher) {
7669
b.iter(|| {
77-
let mut fin = sample_file("github-dekellum.html")
78-
.expect("sample_file");
70+
let mut fin = sample_file("github-dekellum.html").expect("sample_file");
7971
let eh = EncodingHint::shared_default(enc::UTF_8);
8072
parse_buffered(eh, &mut fin).expect("parse");
8173
});
8274
}
8375

8476
#[bench]
8577
fn b20_text_content(b: &mut Bencher) {
86-
let mut fin = sample_file("github-dekellum.html")
87-
.expect("sample_file");
78+
let mut fin = sample_file("github-dekellum.html").expect("sample_file");
8879
let eh = EncodingHint::shared_default(enc::UTF_8);
8980
let doc = parse_buffered(eh, &mut fin).expect("parse");
9081

@@ -96,8 +87,7 @@ fn b20_text_content(b: &mut Bencher) {
9687

9788
#[bench]
9889
fn b30_text_normalize_content(b: &mut Bencher) {
99-
let mut fin = sample_file("github-dekellum.html")
100-
.expect("sample_file");
90+
let mut fin = sample_file("github-dekellum.html").expect("sample_file");
10191
let eh = EncodingHint::shared_default(enc::UTF_8);
10292
let doc = parse_buffered(eh, &mut fin).expect("parse");
10393
b.iter(|| {
@@ -120,8 +110,7 @@ fn b30_text_normalize_content(b: &mut Bencher) {
120110

121111
#[bench]
122112
fn b31_text_normalize_content_identity(b: &mut Bencher) {
123-
let mut fin = sample_file("github-dekellum.html")
124-
.expect("sample_file");
113+
let mut fin = sample_file("github-dekellum.html").expect("sample_file");
125114
let eh = EncodingHint::shared_default(enc::UTF_8);
126115
let mut doc = parse_buffered(eh, &mut fin).expect("parse");
127116
doc.filter(chain_filters!(

‎marked/build.rs‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,21 @@ fn main() {
1313
if rustv < msrv {
1414
panic!(
1515
"{} v{} {} is {} > {} (this rustc)",
16-
PACKAGE, VERSION, M_V, join(&msrv), join(&rustv));
16+
PACKAGE,
17+
VERSION,
18+
M_V,
19+
join(&msrv),
20+
join(&rustv)
21+
);
1722
}
1823
}
1924

2025
fn join(ver: &[u16]) -> String {
2126
let mut out = String::new();
2227
for v in ver {
23-
if !out.is_empty() { out.push('.'); }
28+
if !out.is_empty() {
29+
out.push('.');
30+
}
2431
out.push_str(&v.to_string());
2532
}
2633
out
@@ -39,9 +46,7 @@ fn rustc_version() -> Vec<u16> {
3946
}
4047
let mut vp = v.split("-");
4148
if let Some(v) = vp.next() {
42-
let vs: Vec<u16> = v.split(".")
43-
.filter_map(|vss| vss.parse().ok())
44-
.collect();
49+
let vs: Vec<u16> = v.split(".").filter_map(|vss| vss.parse().ok()).collect();
4550
if !vs.is_empty() {
4651
return vs;
4752
}

0 commit comments

Comments
 (0)