std: merge definitions of StdioPipes · rust-lang/rust@87a00f6 (original) (raw)

`@@ -268,8 +268,8 @@ impl AsInnerimp::Process for Child {

`

268

268

`}

`

269

269

`}

`

270

270

``

271

``

`-

impl FromInner<(imp::Process, imp::StdioPipes)> for Child {

`

272

``

`-

fn from_inner((handle, io): (imp::Process, imp::StdioPipes)) -> Child {

`

``

271

`+

impl FromInner<(imp::Process, StdioPipes)> for Child {

`

``

272

`+

fn from_inner((handle, io): (imp::Process, StdioPipes)) -> Child {

`

273

273

`Child {

`

274

274

` handle,

`

275

275

`stdin: io.stdin.map(ChildStdin::from_inner),

`

`@@ -296,6 +296,15 @@ impl fmt::Debug for Child {

`

296

296

`}

`

297

297

`}

`

298

298

``

``

299

`+

/// The pipes connected to a spawned process.

`

``

300

`+

///

`

``

301

`` +

/// Used to pass pipe handles between this module and [imp].

``

``

302

`+

pub(crate) struct StdioPipes {

`

``

303

`+

pub stdin: Option,

`

``

304

`+

pub stdout: Option,

`

``

305

`+

pub stderr: Option,

`

``

306

`+

}

`

``

307

+

299

308

`/// A handle to a child process's standard input (stdin).

`

300

309

`///

`

301

310

`` /// This struct is used in the [stdin] field on [Child].

``