Skip to content

Commit 22f4be2

Browse files
committed
Remove struct_variant feature gate
1 parent b35dde7 commit 22f4be2

1 file changed

Lines changed: 5 additions & 9 deletions

File tree

src/lib.rs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
//! }
5252
//! ```
5353
#![doc(html_root_url="https://sfackler.github.io/doc")]
54-
#![feature(globs, macro_rules, struct_variant, phase, unsafe_destructor, slicing_syntax, default_type_params, if_let)]
54+
#![feature(globs, macro_rules, phase, unsafe_destructor, slicing_syntax, default_type_params, if_let)]
5555
#![warn(missing_docs)]
5656

5757
extern crate openssl;
@@ -310,8 +310,7 @@ impl Drop for InnerConnection {
310310
}
311311

312312
impl InnerConnection {
313-
fn connect<T>(params: T, ssl: &SslMode)
314-
-> result::Result<InnerConnection, ConnectError>
313+
fn connect<T>(params: T, ssl: &SslMode) -> result::Result<InnerConnection, ConnectError>
315314
where T: IntoConnectParams {
316315
let params = try!(params.into_connect_params());
317316
let stream = try!(io::initialize_stream(&params, ssl));
@@ -565,8 +564,7 @@ impl InnerConnection {
565564
Ok(())
566565
}
567566

568-
fn set_type_names<'a, I>(&mut self, mut it: I) -> Result<()>
569-
where I: Iterator<&'a mut Type> {
567+
fn set_type_names<'a, I>(&mut self, mut it: I) -> Result<()> where I: Iterator<&'a mut Type> {
570568
for ty in it {
571569
if let &Type::Unknown { oid, ref mut name } = ty {
572570
*name = try!(self.get_type_name(oid));
@@ -1081,8 +1079,7 @@ impl<'conn> Statement<'conn> {
10811079
conn.close_statement(self.name[])
10821080
}
10831081

1084-
fn inner_execute(&self, portal_name: &str, row_limit: i32, params: &[&ToSql])
1085-
-> Result<()> {
1082+
fn inner_execute(&self, portal_name: &str, row_limit: i32, params: &[&ToSql]) -> Result<()> {
10861083
let mut conn = self.conn.conn.borrow_mut();
10871084
if self.param_types.len() != params.len() {
10881085
return Err(Error::PgWrongParamCount {
@@ -1122,8 +1119,7 @@ impl<'conn> Statement<'conn> {
11221119
}
11231120
}
11241121

1125-
fn lazy_query<'a>(&'a self, row_limit: i32, params: &[&ToSql])
1126-
-> Result<Rows<'a>> {
1122+
fn lazy_query<'a>(&'a self, row_limit: i32, params: &[&ToSql]) -> Result<Rows<'a>> {
11271123
let id = self.next_portal_id.get();
11281124
self.next_portal_id.set(id + 1);
11291125
let portal_name = format!("{}p{}", self.name, id);

0 commit comments

Comments
 (0)