Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/AndrewEdwards/phobos
Browse files Browse the repository at this point in the history
  • Loading branch information
AndrewEdwards committed Jun 29, 2014
2 parents bc14e07 + 4d7b8b1 commit 5710563
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion std/getopt.d
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ getopt(args, "tune", &tuningParms);
With the above code you can invoke the program with
"--tune=alpha=0.5,beta=0.6", or "--tune alpha=0.5,beta=0.6".
In general, the keys and values can be of any parsable types.
In general, the keys and values can be of any parsable types.)
$(LI $(I Callback options.) An option can be bound to a function or
delegate with the signature $(D void function()), $(D void function(string option)),
Expand Down
2 changes: 1 addition & 1 deletion std/random.d
Original file line number Diff line number Diff line change
Expand Up @@ -1590,7 +1590,7 @@ unittest

/**
* Generates a uniformly-distributed floating point number of type
* $(D T) in the range [0, 1). If no random number generator is
* $(D T) in the range [0, 1$(RPAREN). If no random number generator is
* specified, the default RNG $(D rndGen) will be used as the source
* of randomness.
*
Expand Down
1 change: 1 addition & 0 deletions std/stdio.d
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Authors: $(WEB digitalmars.com, Walter Bright),
module std.stdio;

public import core.stdc.stdio, std.string : KeepTerminator;
import core.atomic : atomicOp;
import core.vararg;
static import std.c.stdio;
import std.stdiobase;
Expand Down
6 changes: 3 additions & 3 deletions std/uni.d
Original file line number Diff line number Diff line change
Expand Up @@ -2326,9 +2326,9 @@ public:
* in form of open-right intervals.
*
* The formatting flag is applied individually to each value, for example:
* $(LI $(B %s) and $(B %d) format the intervals as a [low..high) range of integrals)
* $(LI $(B %x) formats the intervals as a [low..high) range of lowercase hex characters)
* $(LI $(B %X) formats the intervals as a [low..high) range of uppercase hex characters)
* $(LI $(B %s) and $(B %d) format the intervals as a [low..high$(RPAREN) range of integrals)
* $(LI $(B %x) formats the intervals as a [low..high$(RPAREN) range of lowercase hex characters)
* $(LI $(B %X) formats the intervals as a [low..high$(RPAREN) range of uppercase hex characters)
*/
void toString(scope void delegate(const(char)[]) sink,
FormatSpec!char fmt) /* const */
Expand Down

1 comment on commit 5710563

@denis-sh
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hope this is the last time someone disfigure remote master branch.

Please sign in to comment.