Skip to content

Commit 1be72f9

Browse files
baileynbaileyn
committed
Ran cargo fmt
1 parent 1497b84 commit 1be72f9

39 files changed

+1655
-1324
lines changed

‎src/app.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ pub trait RequestApp {
127127

128128
impl<T: Request + ?Sized> RequestApp for T {
129129
fn app(&self) -> &Arc<App> {
130-
self.extensions().find::<Arc<App>>().expect("Missing app")
130+
self.extensions()
131+
.find::<Arc<App>>()
132+
.expect("Missing app")
131133
}
132134
}

‎src/badge.rs

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,22 +100,26 @@ impl Badge {
100100

101101
let json = json!({"badge_type": k, "attributes": attributes_json});
102102
if serde_json::from_value::<Badge>(json).is_ok() {
103-
new_badges.push(NewBadge {
104-
crate_id: krate.id,
105-
badge_type: &**k,
106-
attributes: attributes_json,
107-
});
103+
new_badges.push(
104+
NewBadge {
105+
crate_id: krate.id,
106+
badge_type: &**k,
107+
attributes: attributes_json,
108+
},
109+
);
108110
} else {
109111
invalid_badges.push(&**k);
110112
}
111113
}
112114
}
113115

114-
conn.transaction(|| {
115-
delete(badges::table.filter(badges::crate_id.eq(krate.id)))
116-
.execute(conn)?;
117-
insert(&new_badges).into(badges::table).execute(conn)?;
118-
Ok(invalid_badges)
119-
})
116+
conn.transaction(
117+
|| {
118+
delete(badges::table.filter(badges::crate_id.eq(krate.id)))
119+
.execute(conn)?;
120+
insert(&new_badges).into(badges::table).execute(conn)?;
121+
Ok(invalid_badges)
122+
},
123+
)
120124
}
121125
}

‎src/bin/delete-crate.rs

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,16 @@ fn delete(tx: &postgres::transaction::Transaction) {
5555
for v in versions.iter() {
5656
println!("deleting version {} ({})", v.num, v.id);
5757
let n = tx.execute(
58-
"DELETE FROM version_downloads WHERE version_id = $1",
59-
&[&v.id],
60-
).unwrap();
58+
"DELETE FROM version_downloads WHERE version_id = $1",
59+
&[&v.id],
60+
)
61+
.unwrap();
6162
println!(" {} download records deleted", n);
6263
let n = tx.execute(
63-
"DELETE FROM version_authors WHERE version_id = $1",
64-
&[&v.id],
65-
).unwrap();
64+
"DELETE FROM version_authors WHERE version_id = $1",
65+
&[&v.id],
66+
)
67+
.unwrap();
6668
println!(" {} author records deleted", n);
6769
let n = tx.execute("DELETE FROM dependencies WHERE version_id = $1", &[&v.id])
6870
.unwrap();
@@ -78,9 +80,10 @@ fn delete(tx: &postgres::transaction::Transaction) {
7880

7981
println!("deleting crate download records");
8082
let n = tx.execute(
81-
"DELETE FROM crate_downloads WHERE crate_id = $1",
82-
&[&krate.id],
83-
).unwrap();
83+
"DELETE FROM crate_downloads WHERE crate_id = $1",
84+
&[&krate.id],
85+
)
86+
.unwrap();
8487
println!(" {} deleted", n);
8588

8689
println!("deleting crate owners");
@@ -90,29 +93,33 @@ fn delete(tx: &postgres::transaction::Transaction) {
9093

9194
println!("disabling reserved crate name trigger");
9295
let _ = tx.execute(
93-
"ALTER TABLE crates DISABLE TRIGGER trigger_ensure_crate_name_not_reserved;",
94-
&[],
95-
).unwrap();
96+
"ALTER TABLE crates DISABLE TRIGGER trigger_ensure_crate_name_not_reserved;",
97+
&[],
98+
)
99+
.unwrap();
96100

97101
println!("deleting crate keyword connections");
98102
let n = tx.execute(
99-
"DELETE FROM crates_keywords WHERE crate_id = $1",
100-
&[&krate.id],
101-
).unwrap();
103+
"DELETE FROM crates_keywords WHERE crate_id = $1",
104+
&[&krate.id],
105+
)
106+
.unwrap();
102107
println!(" {} deleted", n);
103108

104109
println!("deleting crate category connections");
105110
let n = tx.execute(
106-
"DELETE FROM crates_categories WHERE crate_id = $1",
107-
&[&krate.id],
108-
).unwrap();
111+
"DELETE FROM crates_categories WHERE crate_id = $1",
112+
&[&krate.id],
113+
)
114+
.unwrap();
109115
println!(" {} deleted", n);
110116

111117
println!("enabling reserved crate name trigger");
112118
let _ = tx.execute(
113-
"ALTER TABLE crates ENABLE TRIGGER trigger_ensure_crate_name_not_reserved;",
114-
&[],
115-
).unwrap();
119+
"ALTER TABLE crates ENABLE TRIGGER trigger_ensure_crate_name_not_reserved;",
120+
&[],
121+
)
122+
.unwrap();
116123

117124
println!("deleting crate badges");
118125
let n = tx.execute("DELETE FROM badges WHERE crate_id = $1", &[&krate.id])

‎src/bin/delete-version.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,16 @@ fn delete(tx: &postgres::transaction::Transaction) {
6565

6666
println!("deleting version {} ({})", v.num, v.id);
6767
let n = tx.execute(
68-
"DELETE FROM version_downloads WHERE version_id = $1",
69-
&[&v.id],
70-
).unwrap();
68+
"DELETE FROM version_downloads WHERE version_id = $1",
69+
&[&v.id],
70+
)
71+
.unwrap();
7172
println!(" {} download records deleted", n);
7273
let n = tx.execute(
73-
"DELETE FROM version_authors WHERE version_id = $1",
74-
&[&v.id],
75-
).unwrap();
74+
"DELETE FROM version_authors WHERE version_id = $1",
75+
&[&v.id],
76+
)
77+
.unwrap();
7678
println!(" {} author records deleted", n);
7779
let n = tx.execute("DELETE FROM dependencies WHERE version_id = $1", &[&v.id])
7880
.unwrap();

‎src/bin/fill-in-user-id.rs

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,15 @@ fn update(app: &App, tx: &postgres::transaction::Transaction) {
5656
let rows = tx.query(query, &[])
5757
.unwrap()
5858
.into_iter()
59-
.map(|row| {
60-
let id: i32 = row.get("id");
61-
let login: String = row.get("gh_login");
62-
let token: String = row.get("gh_access_token");
63-
let avatar: Option<String> = row.get("gh_avatar");
64-
(id, login, http::token(token), avatar)
65-
})
59+
.map(
60+
|row| {
61+
let id: i32 = row.get("id");
62+
let login: String = row.get("gh_login");
63+
let token: String = row.get("gh_access_token");
64+
let avatar: Option<String> = row.get("gh_avatar");
65+
(id, login, http::token(token), avatar)
66+
},
67+
)
6668
.collect::<Vec<_>>();
6769

6870
for (id, login, token, avatar) in rows {
@@ -78,9 +80,9 @@ fn update(app: &App, tx: &postgres::transaction::Transaction) {
7880
}
7981
if ghuser.login == login {
8082
tx.execute(
81-
"UPDATE users SET gh_id = $1 WHERE id = $2",
82-
&[&ghuser.id, &id],
83-
)?;
83+
"UPDATE users SET gh_id = $1 WHERE id = $2",
84+
&[&ghuser.id, &id],
85+
)?;
8486
Ok(())
8587
} else {
8688
Err(human(&format_args!("different login: {}", ghuser.login)))

‎src/bin/populate.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ fn main() {
2727
}
2828

2929
fn update(tx: &postgres::transaction::Transaction) -> postgres::Result<()> {
30-
let ids = env::args().skip(1).filter_map(
31-
|arg| arg.parse::<i32>().ok(),
32-
);
30+
let ids = env::args()
31+
.skip(1)
32+
.filter_map(|arg| arg.parse::<i32>().ok());
3333
for id in ids {
3434
let now = time::now_utc().to_timespec();
3535
let mut rng = StdRng::new().unwrap();
@@ -39,11 +39,11 @@ fn update(tx: &postgres::transaction::Transaction) -> postgres::Result<()> {
3939
let moment = now + Duration::days(-day);
4040
dls += rng.gen_range(-100, 100);
4141
tx.execute(
42-
"INSERT INTO version_downloads \
42+
"INSERT INTO version_downloads \
4343
(version_id, downloads, date) \
4444
VALUES ($1, $2, $3)",
45-
&[&id, &dls, &moment],
46-
)?;
45+
&[&id, &dls, &moment],
46+
)?;
4747
}
4848
}
4949
Ok(())

‎src/bin/transfer-crates.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,13 @@ fn transfer(tx: &postgres::transaction::Transaction) {
6969

7070

7171
let stmt = tx.prepare(
72-
"SELECT * FROM crate_owners
72+
"SELECT * FROM crate_owners
7373
WHERE owner_id = $1
7474
AND owner_kind = $2",
75-
).unwrap();
76-
let rows = stmt.query(&[&from.id, &(OwnerKind::User as i32)]).unwrap();
75+
)
76+
.unwrap();
77+
let rows = stmt.query(&[&from.id, &(OwnerKind::User as i32)])
78+
.unwrap();
7779
for row in rows.iter() {
7880
let id: i32 = row.get("id");
7981
let krate = Crate::find(tx, row.get("crate_id")).unwrap();
@@ -83,10 +85,11 @@ fn transfer(tx: &postgres::transaction::Transaction) {
8385
println!("warning: not exactly one owner for {}", krate.name);
8486
}
8587
let n = tx.execute(
86-
"UPDATE crate_owners SET owner_id = $1
88+
"UPDATE crate_owners SET owner_id = $1
8789
WHERE id $2",
88-
&[&to.id, &id],
89-
).unwrap();
90+
&[&to.id, &id],
91+
)
92+
.unwrap();
9093
assert_eq!(n, 1);
9194
}
9295

0 commit comments

Comments
 (0)