Skip to content

Commit 5410363

Browse files
committed
Fix deprecations
1 parent d381269 commit 5410363

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

src/lib.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ impl<'a> IntoConnectParams for &'a str {
212212
}
213213

214214
impl IntoConnectParams for Url {
215+
#[allow(deprecated)]
215216
fn into_connect_params(self) -> Result<PostgresConnectParams, PostgresConnectError> {
216217
let Url {
217218
host,
@@ -566,8 +567,8 @@ impl InnerPostgresConnection {
566567
try!(self.wait_for_ready());
567568

568569
// now that the connection is ready again, get unknown type names
569-
try!(self.set_type_names(param_types.mut_iter()));
570-
try!(self.set_type_names(result_desc.mut_iter().map(|d| &mut d.ty)));
570+
try!(self.set_type_names(param_types.iter_mut()));
571+
try!(self.set_type_names(result_desc.iter_mut().map(|d| &mut d.ty)));
571572

572573
Ok(PostgresStatement {
573574
conn: conn,

src/types/array.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ impl<T> ArrayBase<T> {
140140
assert!(info1 == info2, "Cannot join differently shaped arrays");
141141
}
142142
self.info.get_mut(0).len += 1;
143-
self.data.push_all_move(other.data);
143+
self.data.extend(other.data.into_iter());
144144
}
145145

146146
/// Returns an iterator over the values in this array, in the

src/types/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ to_raw_to_impl!(PgTsRange | PgTstzRange, Range<Timespec>)
672672
impl<'a> ToSql for &'a str {
673673
fn to_sql(&self, ty: &PostgresType) -> PostgresResult<(Format, Option<Vec<u8>>)> {
674674
check_types!(PgVarchar | PgText | PgCharN | PgName, ty)
675-
Ok((Text, Some(Vec::from_slice(self.as_bytes()))))
675+
Ok((Text, Some(self.as_bytes().to_vec())))
676676
}
677677
}
678678

@@ -681,7 +681,7 @@ to_option_impl_lifetime!(PgVarchar | PgText | PgCharN | PgName, &'a str)
681681
impl<'a> ToSql for &'a [u8] {
682682
fn to_sql(&self, ty: &PostgresType) -> PostgresResult<(Format, Option<Vec<u8>>)> {
683683
check_types!(PgByteA, ty)
684-
Ok((Binary, Some(Vec::from_slice(*self))))
684+
Ok((Binary, Some(self.to_vec())))
685685
}
686686
}
687687

0 commit comments

Comments
 (0)