---

yaml
---
r: 31419
b: refs/heads/dist-snap
c: f8dc928
h: refs/heads/master
i:
  31417: 6a9ae6b
  31415: 49c7add
v: v3

Author: graydon

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 62d4f8fe825c907bd03c275f85aeeaf7b25c4336
+refs/heads/dist-snap: f8dc9283ad13f990d1ee5ac814eac49189edcd59
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/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")
+       }
     })
 }
 

branches/dist-snap/src/test/compile-fail/not-utf8.bin

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