mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-29 14:40:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #2085 from monarchdodra/processRet

Browse source 
Fix Issue 11308 - Don't use Voldemort types for std.process output
This commit is contained in:
Lars T. Kyllingstad 2014-04-18 12:48:55 +02:00
commit 9579b42cc5
1 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

38
std/process.d
View file

@ -1259,7 +1259,7 @@ A non-blocking version of $(LREF wait).
If the process associated with $(D pid) has already terminated,
$(D tryWait) has the exact same effect as $(D wait).
In this case, it returns a struct where the $(D terminated) field
In this case, it returns a tuple where the $(D terminated) field
is set to $(D true) and the $(D status) field has the same
interpretation as the return value of $(D wait).
@ -1273,10 +1273,7 @@ get the exit code, but also to avoid the process becoming a "zombie"
when it finally terminates. (See $(LREF wait) for details).
Returns:
A $(D struct) which contains the fields $(D bool terminated)
and $(D int status). (This will most likely change to become a
$(D std.typecons.Tuple!(bool,"terminated",int,"status")) in the future,
but a compiler bug currently prevents this.)
An $(D std.typecons.Tuple!(bool, "terminated", int, "status")).
Throws:
$(LREF ProcessException) on failure.
@ -1303,14 +1300,10 @@ by the time we reach the end of the scope.
*/
auto tryWait(Pid pid) @safe
{
struct TryWaitResult
{
bool terminated;
int status;
}
import std.typecons : Tuple;
assert(pid !is null, "Called tryWait on a null Pid.");
auto code = pid.performWait(false);
return TryWaitResult(pid._processID == Pid.terminated, code);
return Tuple!(bool, "terminated", int, "status")(pid._processID == Pid.terminated, code);
}
// unittest: This function is tested together with kill() below.
@ -1946,10 +1939,7 @@ workDir = The working directory for the new process.
directory.
Returns:
A $(D struct) which contains the fields $(D int status) and
$(D string output). (This will most likely change to become a
$(D std.typecons.Tuple!(int,"status",string,"output")) in the future,
but a compiler bug currently prevents this.)
An $(D std.typecons.Tuple!(int, "status", string, "output")).
POSIX_specific:
If the process is terminated by a signal, the $(D status) field of
@ -2000,6 +1990,8 @@ private auto executeImpl(alias pipeFunc, Cmd)(
size_t maxOutput = size_t.max,
in char[] workDir = null)
{
import std.typecons : Tuple;
auto p = pipeFunc(commandLine, Redirect.stdout | Redirect.stderrToStdout,
env, config, workDir);
@ -2022,8 +2014,7 @@ private auto executeImpl(alias pipeFunc, Cmd)(
// Exhaust the stream, if necessary.
foreach (ubyte[] chunk; p.stdout.byChunk(defaultChunkSize)) { }
struct ProcessOutput { int status; string output; }
return ProcessOutput(wait(p.pid), cast(string) a.data);
return Tuple!(int, "status", string, "output")(wait(p.pid), cast(string) a.data);
}
unittest
@ -2059,6 +2050,19 @@ unittest
assert (r3.output.empty);
}
unittest
{
import std.typecons : Tuple;
void foo() //Just test the compilation
{
auto ret1 = execute(["dummy", "arg"]);
auto ret2 = executeShell("dummy arg");
static assert(is(typeof(ret1) == typeof(ret2)));
Tuple!(int, string) ret3 = execute(["dummy", "arg"]);
}
}
/// An exception that signals a problem with starting or waiting for a process.
class ProcessException : Exception