Merge pull request #36 from rust-lang/relax-lifetimes

Relax lifetime restrictions when creating new commands

Author: pietroalbini

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - `winapi` is no longer required on unix; `nix` is no longer required on windows.
+- Relaxed lifetime restrictions of `Build::cmd` and `Build::cargo`.
 
 ## [0.9.0] - 2020-07-01
 

src/build.rs

@@ -188,13 +188,13 @@ impl BuildDirectory {
 /// API to interact with a running build.
 ///
 /// This is created from [`BuildDirectory::build`](struct.BuildDirectory.html#method.build)
-pub struct Build<'b> {
-    dir: &'b BuildDirectory,
-    toolchain: &'b Toolchain,
+pub struct Build<'ws> {
+    dir: &'ws BuildDirectory,
+    toolchain: &'ws Toolchain,
     sandbox: SandboxBuilder,
 }
 
-impl Build<'_> {
+impl<'ws> Build<'ws> {
     /// Run a command inside the sandbox.
     ///
     /// Any `cargo` invocation will automatically be configured to use a target directory mounted
@@ -219,7 +219,7 @@ impl Build<'_> {
     /// # Ok(())
     /// # }
     /// ```
-    pub fn cmd<R: Runnable>(&self, bin: R) -> Command {
+    pub fn cmd<'pl, R: Runnable>(&self, bin: R) -> Command<'ws, 'pl> {
         let container_dir = &*crate::cmd::container_dirs::TARGET_DIR;
 
         Command::new_sandboxed(
@@ -256,7 +256,7 @@ impl Build<'_> {
     /// # Ok(())
     /// # }
     /// ```
-    pub fn cargo(&self) -> Command {
+    pub fn cargo<'pl>(&self) -> Command<'ws, 'pl> {
         self.cmd(self.toolchain.cargo())
     }