Merge pull request #76 from joelgallant/rust-version

Changes minimum documented rust version to 1.28
rust-lang · Feb 27, 2019 · bdb9be0 · bdb9be0
2 parents 13e7bb6 + 2890031
commit bdb9be0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 55 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # pkg-config-rs
 
 [![Build Status](https://travis-ci.com/alexcrichton/pkg-config-rs.svg?branch=master)](https://travis-ci.com/alexcrichton/pkg-config-rs)
-[![Rust](https://img.shields.io/badge/rust-1.13%2B-blue.svg?maxAge=3600)](https://github.com/alexcrichton/pkg-config-rs/)
+[![Rust](https://img.shields.io/badge/rust-1.28%2B-blue.svg?maxAge=3600)](https://github.com/alexcrichton/pkg-config-rs/)
 
 [Documentation](https://docs.rs/pkg-config)
 
@@ -13,7 +13,7 @@ You can use this crate directly to probe for specific libraries, or use
 [metadeps](https://github.com/joshtriplett/metadeps) to declare all your
 `pkg-config` dependencies in `Cargo.toml`.
 
-This library requires Rust 1.13+.
+This library requires Rust 1.28+.
 
 # Example
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -109,6 +109,7 @@ pub struct Library {
 }
 
 /// Represents all reasons `pkg-config` might not succeed or be run at all.
+#[derive(Debug)]
 pub enum Error {
     /// Aborted because of `*_NO_PKG_CONFIG` environment variable.
     ///
@@ -157,59 +158,6 @@ impl error::Error for Error {
     }
 }
 
-// Workaround for temporary lack of impl Debug for Output in stable std
-struct OutputDebugger<'a>(&'a Output);
-
-// Lifted from 1.7 std
-impl<'a> fmt::Debug for OutputDebugger<'a> {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        let stdout_utf8 = str::from_utf8(&self.0.stdout);
-        let stdout_debug: &fmt::Debug = match stdout_utf8 {
-            Ok(ref str) => str,
-            Err(_) => &self.0.stdout
-        };
-
-        let stderr_utf8 = str::from_utf8(&self.0.stderr);
-        let stderr_debug: &fmt::Debug = match stderr_utf8 {
-            Ok(ref str) => str,
-            Err(_) => &self.0.stderr
-        };
-
-        fmt.debug_struct("Output")
-           .field("status", &self.0.status)
-           .field("stdout", stdout_debug)
-           .field("stderr", stderr_debug)
-           .finish()
-    }
-}
-
-// Workaround for temporary lack of impl Debug for Output in stable std, continued
-impl fmt::Debug for Error {
-    fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-        match *self {
-            Error::EnvNoPkgConfig(ref name) => {
-                f.debug_tuple("EnvNoPkgConfig")
-                 .field(name)
-                 .finish()
-            }
-            Error::CrossCompilation => write!(f, "CrossCompilation"),
-            Error::Command { ref command, ref cause } => {
-                f.debug_struct("Command")
-                 .field("command", command)
-                 .field("cause", cause)
-                 .finish()
-            }
-            Error::Failure { ref command, ref output } => {
-                f.debug_struct("Failure")
-                 .field("command", command)
-                 .field("output", &OutputDebugger(output))
-                 .finish()
-            }
-            Error::__Nonexhaustive => panic!(),
-        }
-    }
-}
-
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
         match *self {