authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-11-11 11:52:50-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-11-11 13:02:39-05:00
logae0a219d1f5495acc4d82421fa24d84186c2a40d
tree10d73e06d67c23cb03bd975bf97d1bfc7aa29a53
parentcd5c9c8998f1669059cee3d915831ee539dea2b6
signaturelock-open Commit is signed but in an unrecognized format.

stop accepting deprecated `use` keyword

closes #2591

5 files changed, 13 insertions(+), 27 deletions(-)

lib/std/zig/parser_test.zig-10
...@@ -1,13 +1,3 @@...@@ -1,13 +1,3 @@
1// TODO remove `use` keyword eventually: https://github.com/ziglang/zig/issues/2591
2test "zig fmt: change use to usingnamespace" {
3 try testTransform(
4 \\use @import("std");
5 ,
6 \\usingnamespace @import("std");
7 \\
8 );
9}
10
11test "zig fmt: async function" {1test "zig fmt: async function" {
12 try testCanonical(2 try testCanonical(
13 \\pub const Server = struct {3 \\pub const Server = struct {
lib/std/zig/render.zig+1-3
...@@ -226,9 +226,7 @@ fn renderTopLevelDecl(allocator: *mem.Allocator, stream: var, tree: *ast.Tree, i...@@ -226,9 +226,7 @@ fn renderTopLevelDecl(allocator: *mem.Allocator, stream: var, tree: *ast.Tree, i
226 if (use_decl.visib_token) |visib_token| {226 if (use_decl.visib_token) |visib_token| {
227 try renderToken(tree, stream, visib_token, indent, start_col, Space.Space); // pub227 try renderToken(tree, stream, visib_token, indent, start_col, Space.Space); // pub
228 }228 }
229 // TODO after depracating use, go back to this:229 try renderToken(tree, stream, use_decl.use_token, indent, start_col, Space.Space); // usingnamespace
230 //try renderToken(tree, stream, use_decl.use_token, indent, start_col, Space.Space); // usingnamespace
231 try stream.write("usingnamespace ");
232 try renderExpression(allocator, stream, tree, indent, start_col, use_decl.expr, Space.None);230 try renderExpression(allocator, stream, tree, indent, start_col, use_decl.expr, Space.None);
233 try renderToken(tree, stream, use_decl.semicolon_token, indent, start_col, Space.Newline); // ;231 try renderToken(tree, stream, use_decl.semicolon_token, indent, start_col, Space.Newline); // ;
234 },232 },
lib/std/zig/tokenizer.zig-1
...@@ -59,7 +59,6 @@ pub const Token = struct {...@@ -59,7 +59,6 @@ pub const Token = struct {
59 Keyword{ .bytes = "undefined", .id = Id.Keyword_undefined },59 Keyword{ .bytes = "undefined", .id = Id.Keyword_undefined },
60 Keyword{ .bytes = "union", .id = Id.Keyword_union },60 Keyword{ .bytes = "union", .id = Id.Keyword_union },
61 Keyword{ .bytes = "unreachable", .id = Id.Keyword_unreachable },61 Keyword{ .bytes = "unreachable", .id = Id.Keyword_unreachable },
62 Keyword{ .bytes = "use", .id = Id.Keyword_usingnamespace },
63 Keyword{ .bytes = "usingnamespace", .id = Id.Keyword_usingnamespace },62 Keyword{ .bytes = "usingnamespace", .id = Id.Keyword_usingnamespace },
64 Keyword{ .bytes = "var", .id = Id.Keyword_var },63 Keyword{ .bytes = "var", .id = Id.Keyword_var },
65 Keyword{ .bytes = "volatile", .id = Id.Keyword_volatile },64 Keyword{ .bytes = "volatile", .id = Id.Keyword_volatile },
src/tokenizer.cpp-1
...@@ -153,7 +153,6 @@ static const struct ZigKeyword zig_keywords[] = {...@@ -153,7 +153,6 @@ static const struct ZigKeyword zig_keywords[] = {
153 {"undefined", TokenIdKeywordUndefined},153 {"undefined", TokenIdKeywordUndefined},
154 {"union", TokenIdKeywordUnion},154 {"union", TokenIdKeywordUnion},
155 {"unreachable", TokenIdKeywordUnreachable},155 {"unreachable", TokenIdKeywordUnreachable},
156 {"use", TokenIdKeywordUsingNamespace},
157 {"usingnamespace", TokenIdKeywordUsingNamespace},156 {"usingnamespace", TokenIdKeywordUsingNamespace},
158 {"var", TokenIdKeywordVar},157 {"var", TokenIdKeywordVar},
159 {"volatile", TokenIdKeywordVolatile},158 {"volatile", TokenIdKeywordVolatile},
test/compare_output.zig+12-12
...@@ -14,8 +14,8 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {...@@ -14,8 +14,8 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
1414
15 cases.addCase(x: {15 cases.addCase(x: {
16 var tc = cases.create("multiple files with private function",16 var tc = cases.create("multiple files with private function",
17 \\use @import("std").io;17 \\usingnamespace @import("std").io;
18 \\use @import("foo.zig");18 \\usingnamespace @import("foo.zig");
19 \\19 \\
20 \\pub fn main() void {20 \\pub fn main() void {
21 \\ privateFunction();21 \\ privateFunction();
...@@ -29,7 +29,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {...@@ -29,7 +29,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
29 , "OK 1\nOK 2\n");29 , "OK 1\nOK 2\n");
3030
31 tc.addSourceFile("foo.zig",31 tc.addSourceFile("foo.zig",
32 \\use @import("std").io;32 \\usingnamespace @import("std").io;
33 \\33 \\
34 \\// purposefully conflicting function with main.zig34 \\// purposefully conflicting function with main.zig
35 \\// but it's private so it should be OK35 \\// but it's private so it should be OK
...@@ -48,8 +48,8 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {...@@ -48,8 +48,8 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
4848
49 cases.addCase(x: {49 cases.addCase(x: {
50 var tc = cases.create("import segregation",50 var tc = cases.create("import segregation",
51 \\use @import("foo.zig");51 \\usingnamespace @import("foo.zig");
52 \\use @import("bar.zig");52 \\usingnamespace @import("bar.zig");
53 \\53 \\
54 \\pub fn main() void {54 \\pub fn main() void {
55 \\ foo_function();55 \\ foo_function();
...@@ -58,7 +58,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {...@@ -58,7 +58,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
58 , "OK\nOK\n");58 , "OK\nOK\n");
5959
60 tc.addSourceFile("foo.zig",60 tc.addSourceFile("foo.zig",
61 \\use @import("std").io;61 \\usingnamespace @import("std").io;
62 \\pub fn foo_function() void {62 \\pub fn foo_function() void {
63 \\ const stdout = &(getStdOut() catch unreachable).outStream().stream;63 \\ const stdout = &(getStdOut() catch unreachable).outStream().stream;
64 \\ stdout.print("OK\n") catch unreachable;64 \\ stdout.print("OK\n") catch unreachable;
...@@ -66,8 +66,8 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {...@@ -66,8 +66,8 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
66 );66 );
6767
68 tc.addSourceFile("bar.zig",68 tc.addSourceFile("bar.zig",
69 \\use @import("other.zig");69 \\usingnamespace @import("other.zig");
70 \\use @import("std").io;70 \\usingnamespace @import("std").io;
71 \\71 \\
72 \\pub fn bar_function() void {72 \\pub fn bar_function() void {
73 \\ if (foo_function()) {73 \\ if (foo_function()) {
...@@ -88,8 +88,8 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {...@@ -88,8 +88,8 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
88 });88 });
8989
90 cases.addCase(x: {90 cases.addCase(x: {
91 var tc = cases.create("two files use import each other",91 var tc = cases.create("two files usingnamespace import each other",
92 \\use @import("a.zig");92 \\usingnamespace @import("a.zig");
93 \\93 \\
94 \\pub fn main() void {94 \\pub fn main() void {
95 \\ ok();95 \\ ok();
...@@ -97,7 +97,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {...@@ -97,7 +97,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
97 , "OK\n");97 , "OK\n");
9898
99 tc.addSourceFile("a.zig",99 tc.addSourceFile("a.zig",
100 \\use @import("b.zig");100 \\usingnamespace @import("b.zig");
101 \\const io = @import("std").io;101 \\const io = @import("std").io;
102 \\102 \\
103 \\pub const a_text = "OK\n";103 \\pub const a_text = "OK\n";
...@@ -109,7 +109,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {...@@ -109,7 +109,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
109 );109 );
110110
111 tc.addSourceFile("b.zig",111 tc.addSourceFile("b.zig",
112 \\use @import("a.zig");112 \\usingnamespace @import("a.zig");
113 \\113 \\
114 \\pub const b_text = a_text;114 \\pub const b_text = a_text;
115 );115 );