Merge pull request #2378 from tom-tan/trusted-file-readText

dnadlinger · dnadlinger · commit b5a783bf40bf · 2014-07-30T18:16:14.000+02:00
Mark std.file.readText as trusted
diff --git a/std/file.d b/std/file.d
@@ -346,9 +346,10 @@ enforce(chomp(readText("deleteme")) == "abc");
 ----
  */
 
-S readText(S = string)(in char[] name)
+S readText(S = string)(in char[] name) @safe if (isSomeString!S)
 {
-    auto result = cast(S) read(name);
+    static auto trustedCast(void[] buf) @trusted { return cast(S)buf; }
+    auto result = trustedCast(read(name));
     std.utf.validate(result);
     return result;
 }

Original file line number	Diff line number	Diff line change
`@@ -346,9 +346,10 @@ enforce(chomp(readText("deleteme")) == "abc");`
`346`	`346`	`----`
`347`	`347`	`*/`
`348`	`348`
`349`		`-S readText(S = string)(in char[] name)`
	`349`	`+S readText(S = string)(in char[] name) @safe if (isSomeString!S)`
`350`	`350`	`{`
`351`		`- auto result = cast(S) read(name);`
	`351`	`+ static auto trustedCast(void[] buf) @trusted { return cast(S)buf; }`
	`352`	`+ auto result = trustedCast(read(name));`
`352`	`353`	`std.utf.validate(result);`
`353`	`354`	`return result;`
`354`	`355`	`}`