debian-packages/vibe-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #206 from vibe-d/nothrow

Browse source 
Nothrow
This commit is contained in:
Sönke Ludwig 2020-04-16 22:10:05 +02:00 committed by GitHub
parent 071e325e7e f8c25adf02
commit af042756a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/vibe/core/path.d
View file

@ -67,7 +67,7 @@ Path relativeTo(Path)(Path path, Path base_path) @safe
enum up = Path.Segment2("..", Path.defaultSeparator);
auto ret = Path(base_nodes.map!(p => up).chain(nodes));
if (path.endsWithSlash) {
if (ret.empty) return Path("." ~ path.toString()[$-1]);
if (ret.empty) return Path.fromTrustedString("." ~ path.toString()[$-1]);
else ret.endsWithSlash = true;
}
return ret;
@ -142,6 +142,12 @@ unittest {
}
}
nothrow unittest {
auto p1 = PosixPath.fromTrustedString("/foo/bar/baz");
auto p2 = PosixPath.fromTrustedString("/foo/baz/bam");
assert(p2.relativeTo(p1).toString == "../../baz/bam");
}
/** Computes the relative path to this path from `base_path` using web path rules.

2
source/vibe/internal/hashmap.d
View file

@ -250,7 +250,7 @@ struct HashMap(TKey, TValue, Traits = DefaultHashMapTraits!TKey)
}
}
unittest {
nothrow unittest {
import std.conv;
HashMap!(string, string) map;