dnim/rust-postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove old feature check module.

Browse Source
This commit is contained in:
Steven Fackler 2018-02-11 21:13:23 -08:00
parent 0516cb9d10
commit 17fcbe3eb8
2 changed files with 8 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
postgres/src/feature_check.rs
View File

@ -1,29 +0,0 @@
#[cfg(all(feature = "bit-vec", not(feature = "with-bit-vec")))]
const _CHECK: BitVecFeatureRenamedSeeDocs = ();
#[cfg(all(feature = "chrono", not(feature = "with-chrono")))]
const _CHECK: ChronoFeatureRenamedSeeDocs = ();
#[cfg(all(feature = "eui48", not(feature = "with-eui48")))]
const _CHECK: Eui48FeatureRenamedSeeDocs = ();
#[cfg(all(feature = "openssl", not(feature = "with-openssl")))]
const _CHECK: OpensslFeatureRenamedSeeDocs = ();
#[cfg(all(feature = "rustc-serialize", not(feature = "with-rustc-serialize")))]
const _CHECK: RustcSerializeFeatureRenamedSeeDocs = ();
#[cfg(all(feature = "security-framework", not(feature = "with-security-framework")))]
const _CHECK: SecurityFrameworkFeatureRenamedSeeDocs = ();
#[cfg(all(feature = "serde_json", not(feature = "with-serde_json")))]
const _CHECK: SerdeJsonFeatureRenamedSeeDocs = ();
#[cfg(all(feature = "time", not(feature = "with-time")))]
const _CHECK: TimeFeatureRenamedSeeDocs = ();
#[cfg(all(feature = "unix_socket", not(feature = "with-unix_socket")))]
const _CHECK: UnixSocketFeatureRenamedSeeDocs = ();
#[cfg(all(feature = "uuid", not(feature = "with-uuid")))]
const _CHECK: UuidFeatureRenamedSeeDocs = ();

23
postgres/src/lib.rs
View File

@ -114,7 +114,6 @@ pub use error::Error;
#[macro_use]
mod macros;
mod feature_check;
mod priv_io;
pub mod tls;
pub mod notification;
@ -573,13 +572,11 @@ impl InnerConnection {
break;
}
}
return Err(
io::Error::new(
io::ErrorKind::InvalidInput,
"COPY queries cannot be directly \
executed",
).into(),
);
return Err(io::Error::new(
io::ErrorKind::InvalidInput,
"COPY queries cannot be directly \
executed",
).into());
}
_ => {
self.desynchronized = true;
@ -607,8 +604,7 @@ impl InnerConnection {
);
debug!(
"executing statement {} with parameters: {:?}",
stmt_name,
params
stmt_name, params
);
{
@ -838,8 +834,7 @@ impl InnerConnection {
let mut variants = vec![];
for row in rows {
variants.push(String::from_sql_nullable(&NAME, row.get(0))
.map_err(error::conversion)?);
variants.push(String::from_sql_nullable(&NAME, row.get(0)).map_err(error::conversion)?);
}
Ok(variants)
@ -909,9 +904,7 @@ impl InnerConnection {
backend::Message::ReadyForQuery(_) => break,
backend::Message::DataRow(body) => {
let row = body.ranges()
.map(|r| {
r.map(|r| String::from_utf8_lossy(&body.buffer()[r]).into_owned())
})
.map(|r| r.map(|r| String::from_utf8_lossy(&body.buffer()[r]).into_owned()))
.collect()?;
result.push(row);
}