---

yaml
---
r: 22757
b: refs/heads/master
c: f8dc928
h: refs/heads/master
i:
  22755: 411247d
v: v3

Author: graydon

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 62d4f8fe825c907bd03c275f85aeeaf7b25c4336
+refs/heads/master: f8dc9283ad13f990d1ee5ac814eac49189edcd59
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/io.rs

@@ -687,7 +687,11 @@ fn seek_in_buf(offset: int, pos: uint, len: uint, whence: seek_style) ->
 
 fn read_whole_file_str(file: ~str) -> result<~str, ~str> {
     result::chain(read_whole_file(file), |bytes| {
-        result::ok(str::from_bytes(bytes))
+        if str::is_utf8(bytes) {
+            result::ok(str::from_bytes(bytes))
+       } else {
+           result::err(file + ~" is not UTF-8")
+       }
     })
 }
 

trunk/src/test/compile-fail/not-utf8.bin

@@ -0,0 +1,5 @@
+// error-pattern: is not UTF-8
+
+fn foo() {
+    #include("not-utf8.bin")
+}