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

Manually cleanup remaining differences between candidate and trunk. std/variant.d is the only file with differences remaining.

Browse source
This commit is contained in:
Brad Roberts 2007-11-27 21:10:16 +00:00
parent 09916d399a
commit 83bde3fc89
5 changed files with 16 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
std/getopt.d
View file

@ -247,7 +247,7 @@ getopt(args,
"bar", &bar); "bar", &bar);
--------- ---------
In the example above, "--foo", "--bar", "--FOo", "--bAr" etc. are recognized. The directive is active til the end of $(D_PARAM getopt), or until the converse directive $(D_PARAM caseSensitive) is encountered: In the example above, "--foo", "--bar", "--FOo", "--bAr" etc. are recognized. The directive is active til the end of $(D_PARAM getopt), or until the converse directive $(D_PARAM caseInsensitive) is encountered:
--------- ---------
bool foo, bar; bool foo, bar;

2
std/metastrings.d
View file

@ -149,7 +149,7 @@ template ToString(char C)
unittest unittest
{ {
auto s = Format!("hel%slo", "world", -138, 'c', true); auto s = Format!("hel%slo", "world", -138, 'c', true);
// BUG 1616 filed: assert(s == "helworldlo-138ctrue"); // BUG 1616 filed: assert(s == "helworldlo-138ctrue", "[" ~ s ~ "]");
} }

6
std/stdio.d
View file

@ -243,6 +243,7 @@ unittest
string file = "dmd-build-test.deleteme.txt"; string file = "dmd-build-test.deleteme.txt";
FILE* f = fopen(file, "w"); FILE* f = fopen(file, "w");
assert(f, getcwd()); assert(f, getcwd());
scope(exit) { std.file.remove(file); }
write(f, "Hello, ", "world number ", 42, "!"); write(f, "Hello, ", "world number ", 42, "!");
fclose(f) == 0 || assert(false); fclose(f) == 0 || assert(false);
assert(cast(char[]) std.file.read(file) == "Hello, world number 42!"); assert(cast(char[]) std.file.read(file) == "Hello, world number 42!");
@ -274,6 +275,7 @@ unittest
string file = "dmd-build-test.deleteme.txt"; string file = "dmd-build-test.deleteme.txt";
FILE* f = fopen(file, "w"); FILE* f = fopen(file, "w");
assert(f); assert(f);
scope(exit) { std.file.remove(file); }
writeln(f, "Hello, ", "world number ", 42, "!"); writeln(f, "Hello, ", "world number ", 42, "!");
fclose(f) == 0 || assert(false); fclose(f) == 0 || assert(false);
assert(cast(char[]) std.file.read(file) == "Hello, world number 42!\n"); assert(cast(char[]) std.file.read(file) == "Hello, world number 42!\n");
@ -366,6 +368,7 @@ unittest
string file = "dmd-build-test.deleteme.txt"; string file = "dmd-build-test.deleteme.txt";
auto f = fopen(file, "w"); auto f = fopen(file, "w");
assert(f); assert(f);
scope(exit) { std.file.remove(file); }
writef(f, "Hello, %s world number %s!", "nice", 42); writef(f, "Hello, %s world number %s!", "nice", 42);
fclose(f) == 0 || assert(false); fclose(f) == 0 || assert(false);
assert(cast(char[]) std.file.read(file) == "Hello, nice world number 42!"); assert(cast(char[]) std.file.read(file) == "Hello, nice world number 42!");
@ -393,6 +396,7 @@ unittest
string file = "dmd-build-test.deleteme.txt"; string file = "dmd-build-test.deleteme.txt";
FILE* f = fopen(file, "w"); FILE* f = fopen(file, "w");
assert(f); assert(f);
scope(exit) { std.file.remove(file); }
writefln(f, "Hello, %s world number %s!", "nice", 42); writefln(f, "Hello, %s world number %s!", "nice", 42);
fclose(f) == 0 || assert(false); fclose(f) == 0 || assert(false);
assert(cast(char[]) std.file.read(file) == "Hello, nice world number 42!\n"); assert(cast(char[]) std.file.read(file) == "Hello, nice world number 42!\n");
@ -1058,6 +1062,7 @@ struct lines
unittest unittest
{ {
string file = "dmd-build-test.deleteme.txt"; string file = "dmd-build-test.deleteme.txt";
scope(exit) { std.file.remove(file); }
alias TypeTuple!(string, wstring, dstring, alias TypeTuple!(string, wstring, dstring,
char[], wchar[], dchar[]) char[], wchar[], dchar[])
TestedWith; TestedWith;
@ -1244,6 +1249,7 @@ struct chunks
unittest unittest
{ {
string file = "dmd-build-test.deleteme.txt"; string file = "dmd-build-test.deleteme.txt";
scope(exit) { std.file.remove(file); }
// test looping with an empty file // test looping with an empty file
std.file.write(file, ""); std.file.write(file, "");
auto f = fopen(file, "r"); auto f = fopen(file, "r");

14
std/traits.d
View file

@ -470,13 +470,13 @@ static assert (!isStaticArray!(const(int)[4][]));
static assert (!isStaticArray!(int[])); static assert (!isStaticArray!(int[]));
static assert (!isStaticArray!(int[char])); static assert (!isStaticArray!(int[char]));
static assert (!isStaticArray!(int[1][])); static assert (!isStaticArray!(int[1][]));
static assert(isStaticArray!(invariant char[13u])); static assert (isStaticArray!(invariant char[13u]));
static assert(isStaticArray!(void[0])); static assert (isStaticArray!(const(real)[1]));
static assert(!isStaticArray!(int[int])); static assert (isStaticArray!(const(real)[1][1]));
static assert(!isStaticArray!(int)); static assert (isStaticArray!(typeof("string literal")));
static assert(isStaticArray!(const(real)[1])); static assert (isStaticArray!(void[0]));
static assert(isStaticArray!(const(real)[1][1])); static assert (!isStaticArray!(int[int]));
static assert(isStaticArray!(typeof("string literal"))); static assert (!isStaticArray!(int));
/** /**
* Detect whether type T is a dynamic array. * Detect whether type T is a dynamic array.

29
unittest.d
View file

@ -1,4 +1,3 @@
/* /*
* Copyright (C) 1999-2006 by Digital Mars, www.digitalmars.com * Copyright (C) 1999-2006 by Digital Mars, www.digitalmars.com
* Written by Walter Bright * Written by Walter Bright
@ -26,33 +25,7 @@
// to run the unit tests on them. // to run the unit tests on them.
// Then, it prints out the arguments passed to main(). // Then, it prints out the arguments passed to main().
import std.c.stdio; import all_std_modules_generated;
import std.string;
import std.path;
import std.math;
import std.math2;
import std.outbuffer;
import std.ctype;
import std.regexp;
import std.random;
import std.date;
import std.dateparse;
import std.demangle;
import std.cstream;
import std.stream;
import std.utf;
import std.uri;
import std.zlib;
import std.md5;
import std.stdio;
import std.conv;
import std.boxer;
import std.bitarray;
import std.uni;
import std.file;
import std.signals;
import std.cpuid;
import std.socket;
int main(char[][] args) int main(char[][] args)
{ {