all: remove used_import hacks fixed in upstream V

larpon · Apr 2, 2024 · 20aba9d · 20aba9d
1 parent a622bc5
commit 20aba9d
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 31 deletions.
diff --git a/lib/audio.b.v b/lib/audio.b.v
@@ -92,6 +92,10 @@ mut:
 	decoders map[u16]&ma.Decoder // sound decoders for sounds loaded from memory
 }
 
+pub fn (ae AudioEngine) str() string {
+	return 'AudioEngine{}' // TODO to allow compiling with `$dbg`
+}
+
 pub fn (mut e AudioEngine) shutdown() ! {
 	for _, sound in e.sounds {
 		if !isnil(sound) {

diff --git a/lib/script.wren.v b/lib/script.wren.v
@@ -24,6 +24,10 @@ mut:
 	fn_ptr  ?wren.ForeignMethodFn
 }
 
+pub fn (wc WrenClass) str() string {
+	return 'WrenClass{}' // TODO to allow compiling with `$dbg`
+}
+
 fn (w WrenVM) on_frame(dt f64) {
 	for wren_class in w.classes {
 		if frame_fn_handle := wren_class.methods['frame'] {

diff --git a/wraps/fontstash/fontstash.c.v b/wraps/fontstash/fontstash.c.v
@@ -21,8 +21,6 @@ $if windows {
 pub type Context = C.FONScontext
 
 //#flag -lfreetype
-// TODO: fontstash.used_import is used to keep v from warning about unused imports
-pub const used_import = 1
 pub const invalid = C.FONS_INVALID // -1
 
 // create_internal returns a fontstash Context allocated on the heap.

diff --git a/wraps/miniaudio/c/miniaudio.c.v b/wraps/miniaudio/c/miniaudio.c.v
@@ -4,8 +4,6 @@
 // is licensed under the unlicense and, are thus, in the public domain.
 module c
 
-pub const used_import = 1
-
 #flag -I @VMODROOT/miniaudio
 $if linux {
 	#flag -lpthread -lm -ldl

diff --git a/wraps/miniaudio/miniaudio.auto.c.v b/wraps/miniaudio/miniaudio.auto.c.v
@@ -1,9 +1,7 @@
 // NOTE this file is auto-generated by chew
 module miniaudio
 
-import miniaudio.c
-
-pub const used_import = c.used_import
+import miniaudio.c as _
 
 //
 // miniaudio.h
@@ -10398,6 +10396,10 @@ pub mut:
 	_pHeap    voidptr
 }
 
+pub fn (en C.ma_engine_node) str() string {
+	return 'C.ma_engine_node'
+}
+
 pub type EngineNode = C.ma_engine_node
 
 // C: `MA_API ma_result ma_engine_node_get_heap_size(const ma_engine_node_config* pConfig, size_t* pHeapSizeInBytes)`
@@ -10475,6 +10477,10 @@ pub mut:
 	// TODO 	MA_NO_RESOURCE_MANAGER C.#ifndef  // ma_resource_manager_data_source*
 }
 
+pub fn (s C.ma_sound) str() string {
+	return 'C.ma_sound{}'
+}
+
 pub type Sound = C.ma_sound
 
 @[typedef]

diff --git a/wraps/sokol/app/app.c.v b/wraps/sokol/app/app.c.v
@@ -12,8 +12,6 @@ $if !no_sokol_app ? {
 	#include "sokol_app.h"
 }
 
-pub const used_import = gfx.used_import
-
 pub fn create_desc() gfx.Desc {
 	metal_desc := gfx.MetalContextDesc{
 		device: metal_get_device()

diff --git a/wraps/sokol/c/sokol.c.v b/wraps/sokol/c/sokol.c.v
@@ -1,8 +1,6 @@
 // Copyright(C) 2022 Lars Pontoppidan. All rights reserved.
 module c
 
-pub const used_import = 1 // TODO
-
 #flag -I @VMODROOT/thirdparty/sokol
 #flag -I @VMODROOT/thirdparty/sokol/util
 

diff --git a/wraps/sokol/f/f.c.v b/wraps/sokol/f/f.c.v
@@ -1,6 +1,4 @@
 module f
 
-import shy.wraps.fontstash
-import shy.wraps.sokol.gfx
-
-pub const used_import = fontstash.used_import + gfx.used_import
+import shy.wraps.fontstash as _
+import shy.wraps.sokol.gfx as _
diff --git a/wraps/sokol/gfx/sokol_gfx.auto.c.v b/wraps/sokol/gfx/sokol_gfx.auto.c.v
@@ -1,12 +1,10 @@
 // NOTE this file is auto-generated by chew
 module gfx
 
-import shy.wraps.sokol.c
+import shy.wraps.sokol.c as _
 
 pub const version = 1
 
-pub const used_import = c.used_import
-
 //
 // sokol_gfx.h
 //

diff --git a/wraps/sokol/sfons/sfons.c.v b/wraps/sokol/sfons/sfons.c.v
@@ -1,7 +1,6 @@
 module sfons
 
 import shy.wraps.fontstash
-import shy.wraps.sokol.f
 import shy.wraps.sokol.memory
 
 @[markused]
@@ -50,9 +49,6 @@ fn C.sfons_destroy(ctx &fontstash.Context)
 fn C.sfons_rgba(r u8, g u8, b u8, a u8) u32
 fn C.sfons_flush(ctx &fontstash.Context)
 
-// keep v from warning about unused imports
-const used_import = f.used_import + fontstash.used_import + 1
-
 @[inline]
 pub fn create(const_desc &Desc) &fontstash.Context {
 	return C.sfons_create(const_desc)

diff --git a/wraps/sokol/sokol.v b/wraps/sokol/sokol.v
@@ -1,6 +1,4 @@
 module sokol
 
-import shy.wraps.sokol.c
-import shy.wraps.sokol.f
-
-pub const used_import = c.used_import + f.used_import
+import shy.wraps.sokol.c as _
+import shy.wraps.sokol.f as _
diff --git a/wraps/wren/c/c.c.v b/wraps/wren/c/c.c.v
@@ -1,8 +1,6 @@
 // Copyright(C) 2022 Lars Pontoppidan. All rights reserved.
 module c
 
-pub const used_import = 1 // TODO
-
 #flag -I @VMODROOT/c/wren/src/include
 #flag -I @VMODROOT/c/wren/src/vm
 #flag -I @VMODROOT/c/wren/src/optional

diff --git a/wraps/wren/wren.auto.c.v b/wraps/wren/wren.auto.c.v
@@ -1,9 +1,7 @@
 // NOTE this file is auto-generated by chew
 module wren
 
-import wren.c
-
-pub const used_import = c.used_import
+import wren.c as _
 
 //
 // wren.h