Merge branch 'master' into llvm6

1 files changed, 6 insertions, 6 deletions

diff --git a/std/buffer.zig b/std/buffer.zig
index 27c6b2f216..be69eafcfe 100644
--- a/std/buffer.zig
+++ b/std/buffer.zig
@@ -151,20 +151,20 @@ pub const Buffer = struct {
 test "simple Buffer" {
     const cstr = @import("cstr.zig");
 
-    var buf = %%Buffer.init(debug.global_allocator, "");
+    var buf = try Buffer.init(debug.global_allocator, "");
     assert(buf.len() == 0);
-    %%buf.append("hello");
-    %%buf.appendByte(' ');
-    %%buf.append("world");
+    try buf.append("hello");
+    try buf.appendByte(' ');
+    try buf.append("world");
     assert(buf.eql("hello world"));
     assert(mem.eql(u8, cstr.toSliceConst(buf.toSliceConst().ptr), buf.toSliceConst()));
 
-    var buf2 = %%Buffer.initFromBuffer(&buf);
+    var buf2 = try Buffer.initFromBuffer(&buf);
     assert(buf.eql(buf2.toSliceConst()));
 
     assert(buf.startsWith("hell"));
     assert(buf.endsWith("orld"));
 
-    %%buf2.resize(4);
+    try buf2.resize(4);
     assert(buf.startsWith(buf2.toSliceConst()));
 }