Skip to content

Commit 18b7cd6

Browse files
jtgeibeljtgeibel
committed
cargo fmt
1 parent 1806daa commit 18b7cd6

27 files changed

+129
-174
lines changed

‎src/badge.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,12 @@ pub enum Badge {
2929
repository: String,
3030
branch: Option<String>,
3131
},
32-
IsItMaintainedIssueResolution { repository: String },
33-
IsItMaintainedOpenIssues { repository: String },
32+
IsItMaintainedIssueResolution {
33+
repository: String,
34+
},
35+
IsItMaintainedOpenIssues {
36+
repository: String,
37+
},
3438
Codecov {
3539
repository: String,
3640
branch: Option<String>,
@@ -41,7 +45,9 @@ pub enum Badge {
4145
branch: Option<String>,
4246
service: Option<String>,
4347
},
44-
Maintenance { status: MaintenanceStatus },
48+
Maintenance {
49+
status: MaintenanceStatus,
50+
},
4551
}
4652

4753
#[derive(Debug, PartialEq, Clone, Copy, Deserialize, Serialize)]

‎src/bin/delete-crate.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ fn delete(conn: &PgConnection) {
3939
let krate = Crate::by_name(&name).first::<Crate>(conn).unwrap();
4040
print!(
4141
"Are you sure you want to delete {} ({}) [y/N]: ",
42-
name,
43-
krate.id
42+
name, krate.id
4443
);
4544
io::stdout().flush().unwrap();
4645
let mut line = String::new();

‎src/bin/delete-version.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ fn delete(conn: &PgConnection) {
5050
.unwrap();
5151
print!(
5252
"Are you sure you want to delete {}#{} ({}) [y/N]: ",
53-
name,
54-
version,
55-
v.id
53+
name, version, v.id
5654
);
5755
io::stdout().flush().unwrap();
5856
let mut line = String::new();

‎src/bin/render-readmes.rs

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,7 @@ fn main() {
132132
let config = config.clone();
133133
version.record_readme_rendering(&conn).expect(&format!(
134134
"[{}-{}] Couldn't record rendering time",
135-
krate_name,
136-
version.num
135+
krate_name, version.num
137136
));
138137
let handle = thread::spawn(move || {
139138
println!("[{}-{}] Rendering README...", krate_name, version.num);
@@ -155,8 +154,7 @@ fn main() {
155154
)
156155
.expect(&format!(
157156
"[{}-{}] Couldn't upload file to S3",
158-
krate_name,
159-
version.num
157+
krate_name, version.num
160158
));
161159
});
162160
tasks.push(handle);
@@ -182,8 +180,7 @@ fn get_readme(config: &Config, version: &Version, krate_name: &str) -> Option<St
182180
let date = Utc::now().to_rfc2822();
183181
let url = Url::parse(&location).expect(&format!(
184182
"[{}-{}] Couldn't parse crate URL",
185-
krate_name,
186-
version.num
183+
krate_name, version.num
187184
));
188185

189186
let mut headers = List::new();
@@ -206,9 +203,7 @@ fn get_readme(config: &Config, version: &Version, krate_name: &str) -> Option<St
206203
if let Err(err) = req.perform() {
207204
println!(
208205
"[{}-{}] Unable to fetch crate: {}",
209-
krate_name,
210-
version.num,
211-
err
206+
krate_name, version.num, err
212207
);
213208
return None;
214209
}
@@ -217,31 +212,26 @@ fn get_readme(config: &Config, version: &Version, krate_name: &str) -> Option<St
217212
let response = String::from_utf8_lossy(&response);
218213
println!(
219214
"[{}-{}] Failed to get a 200 response: {}",
220-
krate_name,
221-
version.num,
222-
response
215+
krate_name, version.num, response
223216
);
224217
return None;
225218
}
226219
let reader = Cursor::new(response);
227220
let reader = GzDecoder::new(reader).expect(&format!(
228221
"[{}-{}] Invalid gzip header",
229-
krate_name,
230-
version.num
222+
krate_name, version.num
231223
));
232224
let mut archive = Archive::new(reader);
233225
let mut entries = archive.entries().expect(&format!(
234226
"[{}-{}] Invalid tar archive entries",
235-
krate_name,
236-
version.num
227+
krate_name, version.num
237228
));
238229
let manifest: Manifest = {
239230
let path = format!("{}-{}/Cargo.toml", krate_name, version.num);
240231
let contents = find_file_by_path(&mut entries, Path::new(&path), version, krate_name);
241232
toml::from_str(&contents).expect(&format!(
242233
"[{}-{}] Syntax error in manifest file",
243-
krate_name,
244-
version.num
234+
krate_name, version.num
245235
))
246236
};
247237
if manifest.package.readme.is_none() {
@@ -265,8 +255,7 @@ fn get_readme(config: &Config, version: &Version, krate_name: &str) -> Option<St
265255
manifest.package.repository.as_ref().map(|e| &**e),
266256
).expect(&format!(
267257
"[{}-{}] Couldn't render README",
268-
krate_name,
269-
version.num
258+
krate_name, version.num
270259
))
271260
};
272261
return Some(rendered);
@@ -315,8 +304,7 @@ fn find_file_by_path<R: Read>(
315304
let mut contents = String::new();
316305
file.read_to_string(&mut contents).expect(&format!(
317306
"[{}-{}] Couldn't read file contents",
318-
krate_name,
319-
version.num
307+
krate_name, version.num
320308
));
321309
contents
322310
}

‎src/bin/transfer-crates.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ fn transfer(conn: &PgConnection) {
6464

6565
println!(
6666
"Are you sure you want to transfer crates from {} to {}",
67-
from.gh_login,
68-
to.gh_login
67+
from.gh_login, to.gh_login
6968
);
7069
get_confirm("continue");
7170

‎src/boot/categories.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ fn categories_from_toml(
5757
let mut result = vec![];
5858

5959
for (slug, details) in categories {
60-
let details = details.as_table().chain_error(|| {
61-
internal(&format_args!("category {} was not a TOML table", slug))
62-
})?;
60+
let details = details
61+
.as_table()
62+
.chain_error(|| internal(&format_args!("category {} was not a TOML table", slug)))?;
6363

6464
let category = Category::from_parent(
6565
slug,

‎src/category.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,9 @@ impl Category {
8888
.collect();
8989
let crate_categories = categories
9090
.iter()
91-
.map(|c| {
92-
CrateCategory {
93-
category_id: c.id,
94-
crate_id: krate.id,
95-
}
91+
.map(|c| CrateCategory {
92+
category_id: c.id,
93+
crate_id: krate.id,
9694
})
9795
.collect::<Vec<_>>();
9896

@@ -137,9 +135,7 @@ impl Category {
137135
WHERE split_part(c.slug, '::', 1) = c.slug
138136
GROUP BY c.id
139137
{} LIMIT {} OFFSET {}",
140-
sort_sql,
141-
limit,
142-
offset
138+
sort_sql, limit, offset
143139
))).load(conn)
144140
}
145141

‎src/dependency.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,7 @@ pub fn add_dependencies(
109109
.map(|dep| {
110110
let krate = Crate::by_name(&dep.name)
111111
.first::<Crate>(&*conn)
112-
.map_err(|_| {
113-
human(&format_args!("no known crate named `{}`", &*dep.name))
114-
})?;
112+
.map_err(|_| human(&format_args!("no known crate named `{}`", &*dep.name)))?;
115113
if dep.version_req == semver::VersionReq::parse("*").unwrap() {
116114
return Err(human(
117115
"wildcard (`*`) dependency constraints are not allowed \

‎src/github.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ pub fn parse_github_response<'de, 'a: 'de, T: Deserialize<'de>>(
7272
return Err(internal(&format_args!(
7373
"didn't get a 200 result from \
7474
github, got {} with: {}",
75-
n,
76-
resp
75+
n, resp
7776
)));
7877
}
7978
}

‎src/keyword.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,9 @@ impl Keyword {
9696
diesel::delete(CrateKeyword::belonging_to(krate)).execute(conn)?;
9797
let crate_keywords = keywords
9898
.into_iter()
99-
.map(|kw| {
100-
CrateKeyword {
101-
crate_id: krate.id,
102-
keyword_id: kw.id,
103-
}
99+
.map(|kw| CrateKeyword {
100+
crate_id: krate.id,
101+
keyword_id: kw.id,
104102
})
105103
.collect::<Vec<_>>();
106104
diesel::insert_into(crates_keywords::table)

‎src/krate/metadata.rs

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,8 @@ pub fn summary(req: &mut Request) -> CargoResult<Response> {
6666
let recent_downloads = sql::<Nullable<BigInt>>("SUM(crate_downloads.downloads)");
6767
let most_recently_downloaded = crates
6868
.left_join(
69-
crate_downloads::table.on(
70-
id.eq(crate_downloads::crate_id)
71-
.and(crate_downloads::date.gt(date(now - 90.days()))),
72-
),
69+
crate_downloads::table.on(id.eq(crate_downloads::crate_id)
70+
.and(crate_downloads::date.gt(date(now - 90.days())))),
7371
)
7472
.group_by(id)
7573
.order(recent_downloads.desc().nulls_last())
@@ -150,25 +148,23 @@ pub fn show(req: &mut Request) -> CargoResult<Response> {
150148
keywords: Vec<EncodableKeyword>,
151149
categories: Vec<EncodableCategory>,
152150
}
153-
Ok(
154-
req.json(&R {
155-
krate: krate.clone().encodable(
156-
&max_version,
157-
Some(ids),
158-
Some(&kws),
159-
Some(&cats),
160-
Some(badges),
161-
false,
162-
recent_downloads,
163-
),
164-
versions: versions
165-
.into_iter()
166-
.map(|v| v.encodable(&krate.name))
167-
.collect(),
168-
keywords: kws.into_iter().map(|k| k.encodable()).collect(),
169-
categories: cats.into_iter().map(|k| k.encodable()).collect(),
170-
}),
171-
)
151+
Ok(req.json(&R {
152+
krate: krate.clone().encodable(
153+
&max_version,
154+
Some(ids),
155+
Some(&kws),
156+
Some(&cats),
157+
Some(badges),
158+
false,
159+
recent_downloads,
160+
),
161+
versions: versions
162+
.into_iter()
163+
.map(|v| v.encodable(&krate.name))
164+
.collect(),
165+
keywords: kws.into_iter().map(|k| k.encodable()).collect(),
166+
categories: cats.into_iter().map(|k| k.encodable()).collect(),
167+
}))
172168
}
173169

174170
/// Handles the `GET /crates/:crate_id/:version/readme` route.

‎src/krate/mod.rs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -177,26 +177,23 @@ impl<'a> NewCrate<'a> {
177177
Some(s) => s,
178178
None => return Ok(()),
179179
};
180-
let url = Url::parse(url).map_err(|_| {
181-
human(&format_args!("`{}` is not a valid url: `{}`", field, url))
182-
})?;
180+
let url = Url::parse(url)
181+
.map_err(|_| human(&format_args!("`{}` is not a valid url: `{}`", field, url)))?;
183182
match &url.scheme()[..] {
184183
"http" | "https" => {}
185184
s => {
186185
return Err(human(&format_args!(
187186
"`{}` has an invalid url \
188187
scheme: `{}`",
189-
field,
190-
s
188+
field, s
191189
)))
192190
}
193191
}
194192
if url.cannot_be_a_base() {
195193
return Err(human(&format_args!(
196194
"`{}` must have relative scheme \
197195
data: {}",
198-
field,
199-
url
196+
field, url
200197
)));
201198
}
202199
Ok(())
@@ -578,9 +575,9 @@ mod tests {
578575
#[test]
579576
fn documentation_blacklist_url_contains_partial_match() {
580577
assert_eq!(
581-
Crate::remove_blacklisted_documentation_urls(
582-
Some(String::from("http://rust-ci.organists.com")),
583-
),
578+
Crate::remove_blacklisted_documentation_urls(Some(String::from(
579+
"http://rust-ci.organists.com"
580+
)),),
584581
Some(String::from("http://rust-ci.organists.com"))
585582
);
586583
}

‎src/krate/publish.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,10 @@ pub fn publish(req: &mut Request) -> CargoResult<Response> {
8888
}
8989

9090
if krate.name != name {
91-
return Err(human(
92-
&format_args!("crate was previously named `{}`", krate.name),
93-
));
91+
return Err(human(&format_args!(
92+
"crate was previously named `{}`",
93+
krate.name
94+
)));
9495
}
9596

9697
let length = req.content_length()

‎src/krate/search.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,9 @@ pub fn search(req: &mut Request) -> CargoResult<Response> {
5151

5252
let mut query = crates::table
5353
.left_join(
54-
crate_downloads::table.on(
55-
crates::id
56-
.eq(crate_downloads::crate_id)
57-
.and(crate_downloads::date.gt(date(now - 90.days()))),
58-
),
54+
crate_downloads::table.on(crates::id
55+
.eq(crate_downloads::crate_id)
56+
.and(crate_downloads::date.gt(date(now - 90.days())))),
5957
)
6058
.group_by(crates::id)
6159
.select((
@@ -90,10 +88,7 @@ pub fn search(req: &mut Request) -> CargoResult<Response> {
9088
if sort == "downloads" {
9189
query = query.order((perfect_match, crates::downloads.desc()));
9290
} else if sort == "recent-downloads" {
93-
query = query.order((
94-
perfect_match,
95-
recent_downloads.clone().desc().nulls_last(),
96-
));
91+
query = query.order((perfect_match, recent_downloads.clone().desc().nulls_last()));
9792
} else {
9893
let rank = ts_rank_cd(crates::textsearchable_index_col, q);
9994
query = query.order((perfect_match, rank.desc()))

0 commit comments

Comments
 (0)