aboutsummaryrefslogtreecommitdiff
path: root/src-self-hosted
diff options
context:
space:
mode:
authorSahnvour <sahnvour@pm.me>2019-09-03 23:53:05 +0200
committerSahnvour <sahnvour@pm.me>2019-09-03 23:53:05 +0200
commitf08c6e4fe6ad63145ef69377f36f34e9f04cadec (patch)
tree64f59c057ae4c964ab8343d1723612cccd5151bd /src-self-hosted
parentbe17a4b6c1be11eb4b75db1972a38fc50875ebed (diff)
downloadzig-f08c6e4fe6ad63145ef69377f36f34e9f04cadec.tar.gz
zig-f08c6e4fe6ad63145ef69377f36f34e9f04cadec.zip
changing occurrences of HashMap with []const u8 as keys for StringHashMap
Diffstat (limited to 'src-self-hosted')
-rw-r--r--src-self-hosted/arg.zig4
-rw-r--r--src-self-hosted/compilation.zig2
-rw-r--r--src-self-hosted/decl.zig2
-rw-r--r--src-self-hosted/main.zig2
-rw-r--r--src-self-hosted/package.zig2
-rw-r--r--src-self-hosted/stage1.zig4
6 files changed, 8 insertions, 8 deletions
diff --git a/src-self-hosted/arg.zig b/src-self-hosted/arg.zig
index 8f95e2d7ef..8b0ea5ea61 100644
--- a/src-self-hosted/arg.zig
+++ b/src-self-hosted/arg.zig
@@ -5,7 +5,7 @@ const mem = std.mem;
const Allocator = mem.Allocator;
const ArrayList = std.ArrayList;
-const HashMap = std.HashMap;
+const StringHashMap = std.StringHashMap;
fn trimStart(slice: []const u8, ch: u8) []const u8 {
var i: usize = 0;
@@ -73,7 +73,7 @@ fn readFlagArguments(allocator: *Allocator, args: []const []const u8, required:
}
}
-const HashMapFlags = HashMap([]const u8, FlagArg, std.hash.Fnv1a_32.hash, mem.eql_slice_u8);
+const HashMapFlags = StringHashMap(FlagArg);
// A store for querying found flags and positional arguments.
pub const Args = struct {
diff --git a/src-self-hosted/compilation.zig b/src-self-hosted/compilation.zig
index a64e52a2b6..1e71a5e561 100644
--- a/src-self-hosted/compilation.zig
+++ b/src-self-hosted/compilation.zig
@@ -249,7 +249,7 @@ pub const Compilation = struct {
const ArrayTypeTable = std.HashMap(*const Type.Array.Key, *Type.Array, Type.Array.Key.hash, Type.Array.Key.eql);
const PtrTypeTable = std.HashMap(*const Type.Pointer.Key, *Type.Pointer, Type.Pointer.Key.hash, Type.Pointer.Key.eql);
const FnTypeTable = std.HashMap(*const Type.Fn.Key, *Type.Fn, Type.Fn.Key.hash, Type.Fn.Key.eql);
- const TypeTable = std.HashMap([]const u8, *Type, mem.hash_slice_u8, mem.eql_slice_u8);
+ const TypeTable = std.StringHashMap(*Type);
const CompileErrList = std.ArrayList(*Msg);
diff --git a/src-self-hosted/decl.zig b/src-self-hosted/decl.zig
index 25fcf195d1..1af06dea39 100644
--- a/src-self-hosted/decl.zig
+++ b/src-self-hosted/decl.zig
@@ -20,7 +20,7 @@ pub const Decl = struct {
// TODO when we destroy the decl, deref the tree scope
tree_scope: *Scope.AstTree,
- pub const Table = std.HashMap([]const u8, *Decl, mem.hash_slice_u8, mem.eql_slice_u8);
+ pub const Table = std.StringHashMap(*Decl);
pub fn cast(base: *Decl, comptime T: type) ?*T {
if (base.id != @field(Id, @typeName(T))) return null;
diff --git a/src-self-hosted/main.zig b/src-self-hosted/main.zig
index 5136b32735..52eda5824a 100644
--- a/src-self-hosted/main.zig
+++ b/src-self-hosted/main.zig
@@ -541,7 +541,7 @@ const Fmt = struct {
color: errmsg.Color,
loop: *event.Loop,
- const SeenMap = std.HashMap([]const u8, void, mem.hash_slice_u8, mem.eql_slice_u8);
+ const SeenMap = std.StringHashMap(void);
};
fn parseLibcPaths(allocator: *Allocator, libc: *LibCInstallation, libc_paths_file: []const u8) void {
diff --git a/src-self-hosted/package.zig b/src-self-hosted/package.zig
index 0d31731b55..c8d46c7719 100644
--- a/src-self-hosted/package.zig
+++ b/src-self-hosted/package.zig
@@ -10,7 +10,7 @@ pub const Package = struct {
/// relative to root_src_dir
table: Table,
- pub const Table = std.HashMap([]const u8, *Package, mem.hash_slice_u8, mem.eql_slice_u8);
+ pub const Table = std.StringHashMap(*Package);
/// makes internal copies of root_src_dir and root_src_path
/// allocator should be an arena allocator because Package never frees anything
diff --git a/src-self-hosted/stage1.zig b/src-self-hosted/stage1.zig
index b8f13b5d03..2f48f2f450 100644
--- a/src-self-hosted/stage1.zig
+++ b/src-self-hosted/stage1.zig
@@ -343,7 +343,7 @@ const Fmt = struct {
color: errmsg.Color,
allocator: *mem.Allocator,
- const SeenMap = std.HashMap([]const u8, void, mem.hash_slice_u8, mem.eql_slice_u8);
+ const SeenMap = std.StringHashMap(void);
};
fn printErrMsgToFile(
@@ -376,7 +376,7 @@ fn printErrMsgToFile(
const text = text_buf.toOwnedSlice();
const stream = &file.outStream().stream;
- try stream.print( "{}:{}:{}: error: {}\n", path, start_loc.line + 1, start_loc.column + 1, text);
+ try stream.print("{}:{}:{}: error: {}\n", path, start_loc.line + 1, start_loc.column + 1, text);
if (!color_on) return;