Auto merge of #5039 - lawliet89:docopt-bounds, r=alexcrichton

bors · bors · commit d0ca5bcd6b1c · 2018-02-14T06:13:12.000Z
Fix DocOpt deserialization type bounds This is wrt docopt/docopt.rs#222 DocOpt does not support deserializing borrowed types. This change was reverted in docopt/docopt.rs@7292a37 because it broke crates like Cargo etc.
diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs
@@ -40,7 +40,7 @@ extern crate core_foundation;
 
 use std::fmt;
 
-use serde::Deserialize;
+use serde::de::DeserializeOwned;
 use serde::ser;
 use docopt::Docopt;
 use failure::Error;
@@ -103,7 +103,7 @@ impl fmt::Display for VersionInfo {
     }
 }
 
-pub fn call_main_without_stdin<'de, Flags: Deserialize<'de>>(
+pub fn call_main_without_stdin<Flags: DeserializeOwned>(
             exec: fn(Flags, &mut Config) -> CliResult,
             config: &mut Config,
             usage: &str,

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ extern crate core_foundation;`
`40`	`40`
`41`	`41`	`use std::fmt;`
`42`	`42`
`43`		`-use serde::Deserialize;`
	`43`	`+use serde::de::DeserializeOwned;`
`44`	`44`	`use serde::ser;`
`45`	`45`	`use docopt::Docopt;`
`46`	`46`	`use failure::Error;`
`@@ -103,7 +103,7 @@ impl fmt::Display for VersionInfo {`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
`106`		`-pub fn call_main_without_stdin<'de, Flags: Deserialize<'de>>(`
	`106`	`+pub fn call_main_without_stdin<Flags: DeserializeOwned>(`
`107`	`107`	`exec: fn(Flags, &mut Config) -> CliResult,`
`108`	`108`	`config: &mut Config,`
`109`	`109`	`usage: &str,`