Merge remote-tracking branch 'origin/master' into llvm6

1 files changed, 1 insertions, 1 deletions

diff --git a/example/cat/main.zig b/example/cat/main.zig
index 9027122913..00455968be 100644
--- a/example/cat/main.zig
+++ b/example/cat/main.zig
@@ -3,9 +3,9 @@ const io = std.io;
 const mem = std.mem;
 const os = std.os;
 const warn = std.debug.warn;
+const allocator = std.debug.global_allocator;
 
 pub fn main() -> %void {
-    const allocator = &std.debug.global_allocator;
     var args_it = os.args();
     const exe = %return unwrapArg(??args_it.next(allocator));
     var catted_anything = false;