Skip to content

Commit 8d8305d

Browse files
baileynbaileyn
committed
Soooo I updated rustfmt to nightly and then ran it again.
1 parent 1be72f9 commit 8d8305d

38 files changed

+1263
-1515
lines changed

‎build.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ fn main() {
1111
if env::var("PROFILE") == Ok("debug".into()) {
1212
let _ = dotenv();
1313
if let Ok(database_url) = env::var("TEST_DATABASE_URL") {
14-
let connection = PgConnection::establish(&database_url).expect(
15-
"Could not connect to TEST_DATABASE_URL",
16-
);
14+
let connection = PgConnection::establish(&database_url)
15+
.expect("Could not connect to TEST_DATABASE_URL");
1716
run_pending_migrations(&connection).expect("Error running migrations");
1817
}
1918
}

‎src/app.rs‎

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

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

‎src/badge.rs‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -100,26 +100,22 @@ 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(
104-
NewBadge {
105-
crate_id: krate.id,
106-
badge_type: &**k,
107-
attributes: attributes_json,
108-
},
109-
);
103+
new_badges.push(NewBadge {
104+
crate_id: krate.id,
105+
badge_type: &**k,
106+
attributes: attributes_json,
107+
});
110108
} else {
111109
invalid_badges.push(&**k);
112110
}
113111
}
114112
}
115113

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-
)
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+
})
124120
}
125121
}

‎src/bin/delete-crate.rs‎

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,14 @@ 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-
)
61-
.unwrap();
58+
"DELETE FROM version_downloads WHERE version_id = $1",
59+
&[&v.id],
60+
).unwrap();
6261
println!(" {} download records deleted", n);
6362
let n = tx.execute(
64-
"DELETE FROM version_authors WHERE version_id = $1",
65-
&[&v.id],
66-
)
67-
.unwrap();
63+
"DELETE FROM version_authors WHERE version_id = $1",
64+
&[&v.id],
65+
).unwrap();
6866
println!(" {} author records deleted", n);
6967
let n = tx.execute("DELETE FROM dependencies WHERE version_id = $1", &[&v.id])
7068
.unwrap();
@@ -80,10 +78,9 @@ fn delete(tx: &postgres::transaction::Transaction) {
8078

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

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

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

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

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

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

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

‎src/bin/delete-version.rs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,14 @@ 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-
)
71-
.unwrap();
68+
"DELETE FROM version_downloads WHERE version_id = $1",
69+
&[&v.id],
70+
).unwrap();
7271
println!(" {} download records deleted", n);
7372
let n = tx.execute(
74-
"DELETE FROM version_authors WHERE version_id = $1",
75-
&[&v.id],
76-
)
77-
.unwrap();
73+
"DELETE FROM version_authors WHERE version_id = $1",
74+
&[&v.id],
75+
).unwrap();
7876
println!(" {} author records deleted", n);
7977
let n = tx.execute("DELETE FROM dependencies WHERE version_id = $1", &[&v.id])
8078
.unwrap();

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

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,13 @@ fn update(app: &App, tx: &postgres::transaction::Transaction) {
5656
let rows = tx.query(query, &[])
5757
.unwrap()
5858
.into_iter()
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-
)
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+
})
6866
.collect::<Vec<_>>();
6967

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

‎src/bin/populate.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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 \
43-
(version_id, downloads, date) \
44-
VALUES ($1, $2, $3)",
45-
&[&id, &dls, &moment],
46-
)?;
42+
"INSERT INTO version_downloads \
43+
(version_id, downloads, date) \
44+
VALUES ($1, $2, $3)",
45+
&[&id, &dls, &moment],
46+
)?;
4747
}
4848
}
4949
Ok(())

‎src/bin/transfer-crates.rs‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,11 @@ 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-
)
76-
.unwrap();
77-
let rows = stmt.query(&[&from.id, &(OwnerKind::User as i32)])
78-
.unwrap();
75+
).unwrap();
76+
let rows = stmt.query(&[&from.id, &(OwnerKind::User as i32)]).unwrap();
7977
for row in rows.iter() {
8078
let id: i32 = row.get("id");
8179
let krate = Crate::find(tx, row.get("crate_id")).unwrap();
@@ -85,11 +83,10 @@ fn transfer(tx: &postgres::transaction::Transaction) {
8583
println!("warning: not exactly one owner for {}", krate.name);
8684
}
8785
let n = tx.execute(
88-
"UPDATE crate_owners SET owner_id = $1
86+
"UPDATE crate_owners SET owner_id = $1
8987
WHERE id $2",
90-
&[&to.id, &id],
91-
)
92-
.unwrap();
88+
&[&to.id, &id],
89+
).unwrap();
9390
assert_eq!(n, 1);
9491
}
9592

0 commit comments

Comments
 (0)