From c49b3b94b92ac08fd4a84339c1d5f2d223e649ed Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 16 Aug 2024 15:32:21 -0700
Subject: [PATCH] pkg/oni: yeet usingnamespace

---
 pkg/oniguruma/c.zig      |  2 +-
 pkg/oniguruma/errors.zig |  2 +-
 pkg/oniguruma/init.zig   |  2 +-
 pkg/oniguruma/main.zig   | 18 +++++++++++++-----
 pkg/oniguruma/regex.zig  |  2 +-
 pkg/oniguruma/region.zig |  2 +-
 pkg/oniguruma/types.zig  |  2 +-
 7 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/pkg/oniguruma/c.zig b/pkg/oniguruma/c.zig
index 1788a6289..73732f903 100644
--- a/pkg/oniguruma/c.zig
+++ b/pkg/oniguruma/c.zig
@@ -1,3 +1,3 @@
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("oniguruma.h");
 });
diff --git a/pkg/oniguruma/errors.zig b/pkg/oniguruma/errors.zig
index f13eda95a..d63a481bd 100644
--- a/pkg/oniguruma/errors.zig
+++ b/pkg/oniguruma/errors.zig
@@ -1,4 +1,4 @@
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const Encoding = @import("types.zig").Encoding;
 
 /// Maximum error message length.
diff --git a/pkg/oniguruma/init.zig b/pkg/oniguruma/init.zig
index bf7420e40..933e50b5a 100644
--- a/pkg/oniguruma/init.zig
+++ b/pkg/oniguruma/init.zig
@@ -1,4 +1,4 @@
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const Encoding = @import("types.zig").Encoding;
 const errors = @import("errors.zig");
 
diff --git a/pkg/oniguruma/main.zig b/pkg/oniguruma/main.zig
index b4eb3053b..a8e415cfb 100644
--- a/pkg/oniguruma/main.zig
+++ b/pkg/oniguruma/main.zig
@@ -1,10 +1,18 @@
-pub usingnamespace @import("init.zig");
-pub usingnamespace @import("errors.zig");
-pub usingnamespace @import("regex.zig");
-pub usingnamespace @import("region.zig");
-pub usingnamespace @import("types.zig");
+const initpkg = @import("init.zig");
+const regex = @import("regex.zig");
+const region = @import("region.zig");
+const types = @import("types.zig");
+
 pub const c = @import("c.zig");
 pub const testing = @import("testing.zig");
+pub const errors = @import("errors.zig");
+
+pub const init = initpkg.init;
+pub const deinit = initpkg.deinit;
+pub const Encoding = types.Encoding;
+pub const Regex = regex.Regex;
+pub const Region = region.Region;
+pub const Syntax = types.Syntax;
 
 test {
     @import("std").testing.refAllDecls(@This());
diff --git a/pkg/oniguruma/regex.zig b/pkg/oniguruma/regex.zig
index db9689ee2..e0c08d256 100644
--- a/pkg/oniguruma/regex.zig
+++ b/pkg/oniguruma/regex.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const types = @import("types.zig");
 const errors = @import("errors.zig");
 const testEnsureInit = @import("testing.zig").ensureInit;
diff --git a/pkg/oniguruma/region.zig b/pkg/oniguruma/region.zig
index 1b99b55b7..8c5c7a528 100644
--- a/pkg/oniguruma/region.zig
+++ b/pkg/oniguruma/region.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Region = extern struct {
     allocated: c_int = 0,
diff --git a/pkg/oniguruma/types.zig b/pkg/oniguruma/types.zig
index a47149ce0..84a0a7c95 100644
--- a/pkg/oniguruma/types.zig
+++ b/pkg/oniguruma/types.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Encoding = opaque {
     pub const ascii: *Encoding = @ptrCast(c.ONIG_ENCODING_ASCII());