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

2 files changed, 11 insertions, 8 deletions

diff --git a/doc/docgen.zig b/doc/docgen.zig
index 5d7f2b7b38..319d9e0035 100644
--- a/doc/docgen.zig
+++ b/doc/docgen.zig
@@ -50,7 +50,7 @@ pub fn main() !void {
     var tokenizer = Tokenizer.init(in_file_name, input_file_bytes);
     var toc = try genToc(allocator, &tokenizer);
 
-    try fs.makePath(allocator, tmp_dir_name);
+    try fs.cwd().makePath(tmp_dir_name);
     defer fs.deleteTree(tmp_dir_name) catch {};
 
     try genHtml(allocator, &tokenizer, &toc, &buffered_out_stream.stream, zig_exe);
diff --git a/doc/langref.html.in b/doc/langref.html.in
index 31def074d7..455d07b52f 100644
--- a/doc/langref.html.in
+++ b/doc/langref.html.in
@@ -6019,13 +6019,16 @@ pub fn printf(self: *OutStream, arg0: i32, arg1: []const u8) !void {
       </p>
       {#code_begin|syntax#}
 pub fn printValue(self: *OutStream, value: var) !void {
-    const T = @TypeOf(value);
-    if (@isInteger(T)) {
-        return self.printInt(T, value);
-    } else if (@isFloat(T)) {
-        return self.printFloat(T, value);
-    } else {
-        @compileError("Unable to print type '" ++ @typeName(T) ++ "'");
+    switch (@typeInfo(@TypeOf(value))) {
+        .Int => {
+            return self.printInt(T, value);
+        },
+        .Float => {
+            return self.printFloat(T, value);
+        },
+        else => {
+            @compileError("Unable to print type '" ++ @typeName(T) ++ "'");
+        },
     }
 }
       {#code_end#}