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

Merge pull request #68 from wilzbach/fix-deprecations

Browse source 
Fix deprecations: remove the old std.string.removechars
This commit is contained in:
Basile Burg 2017-06-30 04:34:28 +02:00 committed by GitHub
parent f798c4ac28 aab0953e31
commit fd5b9db100
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source/dyaml/constructor.d
View file

@ -540,21 +540,21 @@ unittest
/// Construct a binary (base64) _node. /// Construct a binary (base64) _node.
ubyte[] constructBinary(ref Node node) ubyte[] constructBinary(ref Node node)
{ {
import std.ascii : newline;
import std.array : array;
string value = node.as!string; string value = node.as!string;
// For an unknown reason, this must be nested to work (compiler bug?). // For an unknown reason, this must be nested to work (compiler bug?).
try try
{ {
try{return Base64.decode(value.removechars("\n"));} return Base64.decode(value.representation.filter!(c => !newline.canFind(c)).array);
catch(Exception e)
{
throw new Exception("Unable to decode base64 value: " ~ e.msg);
} }
} catch(Base64Exception e)
catch(UTFException e)
{ {
throw new Exception("Unable to decode base64 value: " ~ e.msg); throw new Exception("Unable to decode base64 value: " ~ e.msg);
} }
} }
unittest unittest
{ {
ubyte[] test = cast(ubyte[])"The Answer: 42"; ubyte[] test = cast(ubyte[])"The Answer: 42";
@ -564,6 +564,7 @@ unittest
auto node = Node(input); auto node = Node(input);
auto value = constructBinary(node); auto value = constructBinary(node);
assert(value == test); assert(value == test);
assert(value == [84, 104, 101, 32, 65, 110, 115, 119, 101, 114, 58, 32, 52, 50]);
} }
/// Construct a timestamp (SysTime) _node. /// Construct a timestamp (SysTime) _node.