Skip to content

Commit 6800937

Browse files
yodaldevoidyodaldevoid
committed
rustfmt run over new yank code
1 parent dd40d50 commit 6800937

File tree

2 files changed

+30
-26
lines changed

2 files changed

+30
-26
lines changed

‎src/tests/krate.rs

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,10 @@ fn yank_not_owner() {
873873

874874
#[test]
875875
fn yank_max_version() {
876-
#[derive(RustcDecodable)] struct O { ok: bool }
876+
#[derive(RustcDecodable)]
877+
struct O {
878+
ok: bool,
879+
}
877880
let (_b, app, middle) = ::app();
878881

879882
// Upload a new crate
@@ -889,67 +892,67 @@ fn yank_max_version() {
889892
// add version 2.0.0
890893
let body = ::new_req_body_version_2(::krate("fyk_max"));
891894
let mut response = ok_resp!(middle.call(req.with_path("/api/v1/crates/new")
892-
.with_method(Method::Put)
893-
.with_body(&body)));
895+
.with_method(Method::Put)
896+
.with_body(&body)));
894897
let json: GoodCrate = ::json(&mut response);
895898
assert!(json.krate.max_version.is_some());
896899
assert_eq!(json.krate.max_version.unwrap(), "2.0.0");
897900

898901
// yank version 1.0.0
899902
let mut r = ok_resp!(middle.call(req.with_method(Method::Delete)
900-
.with_path("/api/v1/crates/fyk_max/1.0.0/yank")));
903+
.with_path("/api/v1/crates/fyk_max/1.0.0/yank")));
901904
assert!(::json::<O>(&mut r).ok);
902905
let mut response = ok_resp!(middle.call(req.with_method(Method::Get)
903-
.with_path("/api/v1/crates/fyk_max")));
906+
.with_path("/api/v1/crates/fyk_max")));
904907
let json: CrateResponse = ::json(&mut response);
905908
assert!(json.krate.max_version.is_some());
906909
assert_eq!(json.krate.max_version.unwrap(), "2.0.0");
907910

908911
// unyank version 1.0.0
909912
let mut r = ok_resp!(middle.call(req.with_method(Method::Put)
910-
.with_path("/api/v1/crates/fyk_max/1.0.0/unyank")));
913+
.with_path("/api/v1/crates/fyk_max/1.0.0/unyank")));
911914
assert!(::json::<O>(&mut r).ok);
912915
let mut response = ok_resp!(middle.call(req.with_method(Method::Get)
913-
.with_path("/api/v1/crates/fyk_max")));
916+
.with_path("/api/v1/crates/fyk_max")));
914917
let json: CrateResponse = ::json(&mut response);
915918
assert!(json.krate.max_version.is_some());
916919
assert_eq!(json.krate.max_version.unwrap(), "2.0.0");
917920

918921
// yank version 2.0.0
919922
let mut r = ok_resp!(middle.call(req.with_method(Method::Delete)
920-
.with_path("/api/v1/crates/fyk_max/2.0.0/yank")));
923+
.with_path("/api/v1/crates/fyk_max/2.0.0/yank")));
921924
assert!(::json::<O>(&mut r).ok);
922925
let mut response = ok_resp!(middle.call(req.with_method(Method::Get)
923-
.with_path("/api/v1/crates/fyk_max")));
926+
.with_path("/api/v1/crates/fyk_max")));
924927
let json: CrateResponse = ::json(&mut response);
925928
assert!(json.krate.max_version.is_some());
926929
assert_eq!(json.krate.max_version.unwrap(), "1.0.0");
927930

928931
// yank version 1.0.0
929932
let mut r = ok_resp!(middle.call(req.with_method(Method::Delete)
930-
.with_path("/api/v1/crates/fyk_max/1.0.0/yank")));
933+
.with_path("/api/v1/crates/fyk_max/1.0.0/yank")));
931934
assert!(::json::<O>(&mut r).ok);
932935
let mut response = ok_resp!(middle.call(req.with_method(Method::Get)
933-
.with_path("/api/v1/crates/fyk_max")));
936+
.with_path("/api/v1/crates/fyk_max")));
934937
let json: CrateResponse = ::json(&mut response);
935938
assert!(json.krate.max_version.is_none());
936939

937940
// unyank version 2.0.0
938941
let mut r = ok_resp!(middle.call(req.with_method(Method::Put)
939-
.with_path("/api/v1/crates/fyk_max/2.0.0/unyank")));
942+
.with_path("/api/v1/crates/fyk_max/2.0.0/unyank")));
940943
assert!(::json::<O>(&mut r).ok);
941944
let mut response = ok_resp!(middle.call(req.with_method(Method::Get)
942-
.with_path("/api/v1/crates/fyk_max")));
945+
.with_path("/api/v1/crates/fyk_max")));
943946
let json: CrateResponse = ::json(&mut response);
944947
assert!(json.krate.max_version.is_some());
945948
assert_eq!(json.krate.max_version.unwrap(), "2.0.0");
946949

947950
// unyank version 1.0.0
948951
let mut r = ok_resp!(middle.call(req.with_method(Method::Put)
949-
.with_path("/api/v1/crates/fyk_max/1.0.0/unyank")));
952+
.with_path("/api/v1/crates/fyk_max/1.0.0/unyank")));
950953
assert!(::json::<O>(&mut r).ok);
951954
let mut response = ok_resp!(middle.call(req.with_method(Method::Get)
952-
.with_path("/api/v1/crates/fyk_max")));
955+
.with_path("/api/v1/crates/fyk_max")));
953956
let json: CrateResponse = ::json(&mut response);
954957
assert!(json.krate.max_version.is_some());
955958
assert_eq!(json.krate.max_version.unwrap(), "2.0.0");

‎src/version.rs

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -195,22 +195,23 @@ impl Version {
195195
&[&yanked, &self.id])?;
196196

197197
let rows = conn.query("SELECT max_version FROM crates WHERE id = $1",
198-
&[&self.crate_id])?;
198+
&[&self.crate_id])?;
199199
let max_version = rows.iter()
200-
.next()
201-
.and_then(|r| r.get::<&str, Option<String>>("max_version"))
202-
.map(|v| semver::Version::parse(&v).unwrap());
200+
.next()
201+
.and_then(|r| r.get::<&str, Option<String>>("max_version"))
202+
.map(|v| semver::Version::parse(&v).unwrap());
203203
let max_update_stmt = conn.prepare("UPDATE crates SET max_version = $1 WHERE id = $2")?;
204204
if let Some(max_version) = max_version {
205205
let zero = semver::Version::parse("0.0.0").unwrap();
206206
if yanked && max_version == self.num {
207-
let new_max = conn.query("SELECT num FROM versions \
208-
WHERE crate_id = $1 AND yanked = FALSE AND id != $2",
209-
&[&self.crate_id, &self.id])?
210-
.iter()
211-
.map(|r| r.get::<&str, String>("num"))
212-
.filter_map(|v| semver::Version::parse(&v).ok())
213-
.max();
207+
let new_max =
208+
conn.query("SELECT num FROM versions WHERE crate_id = $1 AND yanked = FALSE \
209+
AND id != $2",
210+
&[&self.crate_id, &self.id])?
211+
.iter()
212+
.map(|r| r.get::<&str, String>("num"))
213+
.filter_map(|v| semver::Version::parse(&v).ok())
214+
.max();
214215
max_update_stmt.execute(&[&new_max.map(|v| v.to_string()), &self.crate_id])?;
215216
} else if !yanked && (self.num > max_version || max_version == zero) {
216217
max_update_stmt.execute(&[&self.num.to_string(), &self.crate_id])?;

0 commit comments

Comments
 (0)