Skip to content

Commit 565b5b5

Browse files
alexcrichtonalexcrichton
committed
Update to Rust master
1 parent 91654af commit 565b5b5

File tree

5 files changed

+24
-15
lines changed

5 files changed

+24
-15
lines changed

‎src/git.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pub fn serve_index(req: &mut Request) -> CargoResult<Response> {
6565

6666
let (status_code, status_desc) = {
6767
let line = headers.pop_equiv(&"Status").unwrap_or(Vec::new());
68-
let line = line.move_iter().next().unwrap_or(String::new());
68+
let line = line.into_iter().next().unwrap_or(String::new());
6969
let mut parts = line.as_slice().splitn(1, ' ');
7070
(from_str(parts.next().unwrap_or("")).unwrap_or(200),
7171
match parts.next() {

‎src/package.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use conduit::{Request, Response};
66
use conduit_router::RequestParams;
77
use conduit_json_parser;
88
use pg::{PostgresConnection, PostgresRow};
9+
use pg::types::ToSql;
910
use curl::http;
1011

1112
use app::{App, RequestApp};
@@ -52,7 +53,7 @@ impl Package {
5253
pub fn find_by_name(conn: &Connection, name: &str) -> CargoResult<Package> {
5354
let stmt = try!(conn.prepare("SELECT * FROM packages \
5455
WHERE name = $1 LIMIT 1"));
55-
match try!(stmt.query(&[&name])).next() {
56+
match try!(stmt.query(&[&name as &ToSql])).next() {
5657
Some(row) => Ok(Package::from_row(&row)),
5758
None => Err(NotFound.box_error()),
5859
}
@@ -63,15 +64,15 @@ impl Package {
6364
// TODO: like with users, this is sadly racy
6465

6566
let stmt = try!(conn.prepare("SELECT * FROM packages WHERE name = $1"));
66-
let mut rows = try!(stmt.query(&[&name]));
67+
let mut rows = try!(stmt.query(&[&name as &ToSql]));
6768
match rows.next() {
6869
Some(row) => return Ok(Package::from_row(&row)),
6970
None => {}
7071
}
7172
let stmt = try!(conn.prepare("INSERT INTO packages (name, user_id) \
7273
VALUES ($1, $2) \
7374
RETURNING *"));
74-
let mut rows = try!(stmt.query(&[&name, &user_id]));
75+
let mut rows = try!(stmt.query(&[&name as &ToSql, &user_id]));
7576
Ok(Package::from_row(&try!(rows.next().require(|| {
7677
internal("no package returned")
7778
}))))
@@ -142,7 +143,7 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
142143
}
143144

144145
// Massage a response
145-
let pkgs = pkgs.move_iter().map(|p| {
146+
let pkgs = pkgs.into_iter().map(|p| {
146147
let id = p.id;
147148
p.encodable(map.pop(&id).unwrap())
148149
}).collect();
@@ -173,7 +174,7 @@ pub fn show(req: &mut Request) -> CargoResult<Response> {
173174
struct R { package: EncodablePackage, versions: Vec<EncodableVersion>, }
174175
Ok(req.json(&R {
175176
package: pkg.clone().encodable(versions.iter().map(|v| v.id).collect()),
176-
versions: versions.move_iter().map(|v| {
177+
versions: versions.into_iter().map(|v| {
177178
v.encodable(&**req.app(), &pkg)
178179
}).collect(),
179180
}))

‎src/user/mod.rs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use conduit_cookie::{RequestSession};
88
use curl::http;
99
use oauth2::Authorization;
1010
use pg::{PostgresConnection, PostgresRow};
11+
use pg::types::ToSql;
1112

1213
use app::RequestApp;
1314
use db::{Connection, RequestTransaction};
@@ -44,7 +45,8 @@ impl User {
4445
pub fn find_by_api_token(conn: &Connection, token: &str) -> CargoResult<User> {
4546
let stmt = try!(conn.prepare("SELECT * FROM users \
4647
WHERE api_token = $1 LIMIT 1"));
47-
return try!(stmt.query(&[&token])).next().map(User::from_row).require(|| {
48+
return try!(stmt.query(&[&token as &ToSql])).next()
49+
.map(User::from_row).require(|| {
4850
NotFound
4951
})
5052
}
@@ -59,7 +61,8 @@ impl User {
5961
let stmt = try!(conn.prepare("UPDATE users SET gh_access_token = $1 \
6062
WHERE email = $2 \
6163
RETURNING *"));
62-
let mut rows = try!(stmt.query(&[&access_token, &email]));
64+
let mut rows = try!(stmt.query(&[&access_token as &ToSql,
65+
&email as &ToSql]));
6366
match rows.next() {
6467
Some(row) => return Ok(User::from_row(row)),
6568
None => {}
@@ -69,7 +72,9 @@ impl User {
6972
api_token) \
7073
VALUES ($1, $2, $3)
7174
RETURNING *"));
72-
let mut rows = try!(stmt.query(&[&email, &access_token, &api_token]));
75+
let mut rows = try!(stmt.query(&[&email as &ToSql,
76+
&access_token as &ToSql,
77+
&api_token as &ToSql]));
7378
Ok(User::from_row(try!(rows.next().require(|| {
7479
internal("no user with email we just found")
7580
}))))
@@ -106,7 +111,9 @@ pub fn setup(conn: &PostgresConnection) {
106111
unique_email UNIQUE (email)", []).unwrap();
107112
conn.execute("INSERT INTO users (email, gh_access_token, api_token) \
108113
VALUES ($1, $2, $3)",
109-
&[&"[email protected]", &"wut", &"api-token"]).unwrap();
114+
&[&"[email protected]" as &ToSql,
115+
&"wut" as &ToSql,
116+
&"api-token" as &ToSql]).unwrap();
110117
}
111118

112119
pub fn github_authorize(req: &mut Request) -> CargoResult<Response> {

‎src/util/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ impl<'a> RequestUtils for &'a Request + 'a {
4444

4545
fn query(self) -> HashMap<String, String> {
4646
url::form_urlencoded::parse_str(self.query_string().unwrap_or(""))
47-
.move_iter().collect()
47+
.into_iter().collect()
4848
}
4949

5050
fn redirect(self, url: String) -> Response {

‎src/version.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use std::collections::{HashSet, HashMap};
33
use conduit::{Request, Response};
44
use conduit_router::RequestParams;
55
use pg::{PostgresConnection, PostgresRow};
6+
use pg::types::ToSql;
67
use semver;
78
use url;
89

@@ -51,7 +52,7 @@ impl Version {
5152
-> CargoResult<Option<Version>> {
5253
let stmt = try!(conn.prepare("SELECT * FROM versions \
5354
WHERE package_id = $1 AND num = $2"));
54-
let mut rows = try!(stmt.query(&[&package_id, &num]));
55+
let mut rows = try!(stmt.query(&[&package_id, &num as &ToSql]));
5556
Ok(rows.next().map(|r| Version::from_row(&r)))
5657
}
5758

@@ -60,7 +61,7 @@ impl Version {
6061
let stmt = try!(conn.prepare("INSERT INTO versions (package_id, num) \
6162
VALUES ($1, $2) \
6263
RETURNING *"));
63-
let mut rows = try!(stmt.query(&[&package_id, &num]));
64+
let mut rows = try!(stmt.query(&[&package_id, &num as &ToSql]));
6465
Ok(Version::from_row(&try!(rows.next().require(|| {
6566
internal("no version returned")
6667
}))))
@@ -123,7 +124,7 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
123124
}
124125

125126
// Load all packages
126-
let ids = set.move_iter().collect::<Vec<i32>>();
127+
let ids = set.into_iter().collect::<Vec<i32>>();
127128
let query = format!("'{{{:#}}}'::int[]", ids.as_slice());
128129
let stmt = try!(conn.prepare(format!("SELECT * FROM packages \
129130
WHERE id = ANY({})",
@@ -135,7 +136,7 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
135136
}
136137

137138
// And respond!
138-
let versions = versions.move_iter().map(|v| {
139+
let versions = versions.into_iter().map(|v| {
139140
let id = v.package_id;
140141
v.encodable(&**req.app(), map.find(&id).unwrap())
141142
}).collect();

0 commit comments

Comments
 (0)