Fix for upstream changes

Author: sfackler

Cargo.toml

@@ -26,7 +26,7 @@ phf_codegen = "0.6.11"
 [dependencies]
 phf = "0.6"
 openssl = "0.5"
-log = "0.2"
+log = "0.3"
 rustc-serialize = "0.3"
 byteorder = "0.3"
 

build.rs

@@ -1,10 +1,11 @@
-#![feature(std_misc)]
+#![feature(convert)]
 extern crate phf_codegen;
 
 use std::env;
 use std::fs::File;
 use std::io::{Write, BufWriter};
-use std::path::AsPath;
+use std::path::Path;
+use std::convert::AsRef;
 
 // From http://www.postgresql.org/docs/9.2/static/errcodes-appendix.html
 static SQLSTATES: &'static [(&'static str, &'static str)] = &[
@@ -326,7 +327,9 @@ static SQLSTATES: &'static [(&'static str, &'static str)] = &[
     ];
 
 fn main() {
-    let path = env::var_os("OUT_DIR").unwrap().as_path().join("sqlstate.rs");
+    let path = env::var_os("OUT_DIR").unwrap();
+    let path: &Path = path.as_ref();
+    let path = path.join("sqlstate.rs");
     let mut file = BufWriter::new(File::create(&path).unwrap());
 
     make_enum(&mut file);

src/lib.rs

@@ -44,14 +44,15 @@
 //! ```
 #![doc(html_root_url="https://sfackler.github.io/rust-postgres/doc")]
 #![feature(unsafe_destructor, io, core, debug_builders, str_char)]
+#![cfg_attr(feature = "unix_socket", feature(convert))]
 #![warn(missing_docs)]
 
 extern crate byteorder;
 #[macro_use]
 extern crate log;
 extern crate openssl;
 extern crate phf;
-extern crate "rustc-serialize" as serialize;
+extern crate rustc_serialize as serialize;
 #[cfg(feature = "unix_socket")]
 extern crate unix_socket;
 
@@ -175,7 +176,7 @@ impl IntoConnectParams for Url {
 
         #[cfg(feature = "unix_socket")]
         fn make_unix(maybe_path: String) -> result::Result<ConnectTarget, ConnectError> {
-            Ok(ConnectTarget::Unix(PathBuf::new(&maybe_path)))
+            Ok(ConnectTarget::Unix(PathBuf::from(&maybe_path)))
         }
         #[cfg(not(feature = "unix_socket"))]
         fn make_unix(_: String) -> result::Result<ConnectTarget, ConnectError> {
@@ -367,13 +368,12 @@ pub struct CancelData {
 /// ## Example
 ///
 /// ```rust,no_run
-/// # #![allow(unstable)]
 /// # use postgres::{Connection, SslMode};
-/// # use std::thread::Thread;
+/// # use std::thread;
 /// # let url = "";
 /// let conn = Connection::connect(url, &SslMode::None).unwrap();
 /// let cancel_data = conn.cancel_data();
-/// Thread::spawn(move || {
+/// thread::spawn(move || {
 ///     conn.execute("SOME EXPENSIVE QUERY", &[]).unwrap();
 /// });
 /// # let _ =

src/url.rs

@@ -92,7 +92,7 @@ impl Path {
         let (path, rest) = try!(get_path(rawpath, false));
 
         // query and fragment
-        let (query, fragment) = try!(get_query_fragment(rest.as_slice()));
+        let (query, fragment) = try!(get_query_fragment(&rest));
 
         Ok(Path{ path: path, query: query, fragment: fragment })
     }

tests/test.rs

@@ -1,7 +1,7 @@
-#![feature(core, std_misc, thread_sleep)]
+#![feature(std_misc, thread_sleep)]
 
 extern crate postgres;
-extern crate "rustc-serialize" as serialize;
+extern crate rustc_serialize as serialize;
 extern crate url;
 extern crate openssl;
 
@@ -418,7 +418,7 @@ fn test_lazy_query_wrong_conn() {
 fn test_param_types() {
     let conn = or_panic!(Connection::connect("postgres://postgres@localhost", &SslMode::None));
     let stmt = or_panic!(conn.prepare("SELECT $1::INT, $2::VARCHAR"));
-    assert_eq!(stmt.param_types(), [Type::Int4, Type::Varchar].as_slice());
+    assert_eq!(stmt.param_types(), &[Type::Int4, Type::Varchar][..]);
 }
 
 #[test]