From abb3ba567238ec8975dc844bf67d2834614a3eb1 Mon Sep 17 00:00:00 2001 From: xushiwei Date: Thu, 8 Oct 2026 08:01:58 +0800 Subject: [PATCH] cl: x/bitfield => c/bitfield; mod: github.com/goplus/lib v0.6.1 --- cl/_testc/bitfield/out.go | 2 +- cl/bitfield.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- tool/_testc/clang-c-22.1.8/Index.go | 2 +- tool/_testc/clang-c-22.1.8/Index/out.go | 2 +- tool/_testc/clang-c-22.1.8/go.mod | 4 +--- tool/_testc/clang-c-22.1.8/go.sum | 6 ++---- tool/_testc/python-3.14.8/go.mod | 4 +--- tool/_testc/python-3.14.8/go.sum | 6 ++---- tool/_testcpp/llvm-22.1.8-support/go.mod | 4 +--- tool/_testcpp/llvm-22.1.8-support/go.sum | 6 ++---- 12 files changed, 16 insertions(+), 28 deletions(-) diff --git a/cl/_testc/bitfield/out.go b/cl/_testc/bitfield/out.go index 591600ed5..10d828e91 100644 --- a/cl/_testc/bitfield/out.go +++ b/cl/_testc/bitfield/out.go @@ -2,7 +2,7 @@ package foo import ( "github.com/goplus/lib/c" - "github.com/qiniu/x/bitfield" + "github.com/goplus/lib/c/bitfield" "unsafe" ) diff --git a/cl/bitfield.go b/cl/bitfield.go index a35241b68..814239351 100644 --- a/cl/bitfield.go +++ b/cl/bitfield.go @@ -653,7 +653,7 @@ func pushBoolToUint64(ctx *pkgCtx, cb *gogen.CodeBuilder) { } func (p *pkgCtx) bitfieldRef(name string) types.Object { - return p.pkg.Import("github.com/qiniu/x/bitfield").Ref(name) + return p.pkg.Import("github.com/goplus/lib/c/bitfield").Ref(name) } // bitDocComment builds a doc-only comment group holding a single "// text" line diff --git a/go.mod b/go.mod index 5125c5443..d46627a25 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.27.0 // llgo 1.0 require ( github.com/goplus/gogen v1.26.0 - github.com/goplus/lib v0.5.12 + github.com/goplus/lib v0.6.1 github.com/goplus/mod v0.22.1 github.com/llarhub/clang-c v0.9.0 github.com/qiniu/x v1.19.1 diff --git a/go.sum b/go.sum index 3526e5764..d15ed17f8 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/goplus/gogen v1.26.0 h1:A0s5CyFrOKuBy1NaN6apnxNmOoxciYbI81eBzyfYdjg= github.com/goplus/gogen v1.26.0/go.mod h1:Y7ulYW3wonQ3d9er00b0uGFEV/IUZa6okWJZh892ACQ= -github.com/goplus/lib v0.5.12 h1:LZ31xPTvuchVI1lqsKlCRHJIzqSFhXDjWTA1pLoaWb0= -github.com/goplus/lib v0.5.12/go.mod h1:Ucw7fZlTqrcuHgUvZHP8Oce6IwxULgASlzJxLt8E4p8= +github.com/goplus/lib v0.6.1 h1:OrHX3lBRsK3u5Vh045bkPvCoYHXhLmEqPCINHT6qA6Y= +github.com/goplus/lib v0.6.1/go.mod h1:0krESx2ZyKMlgNp3oUMob++WJYR5a1PpubjSmMjnP0c= github.com/goplus/mod v0.22.1 h1:3GQZqKlcQAiMpRUDAHvFryGYie+mT0JMjguEqOtIjkE= github.com/goplus/mod v0.22.1/go.mod h1:APrczG2FtFcQelU4vTq9xw+GrVs4sPPKnRfGidWBlXY= github.com/llarhub/clang-c v0.9.0 h1:aBSsL43vVUM1y8V3Su8IHlUy91vxmJJP4rkDg/tc+Bo= diff --git a/tool/_testc/clang-c-22.1.8/Index.go b/tool/_testc/clang-c-22.1.8/Index.go index bb913e91c..985afce7e 100644 --- a/tool/_testc/clang-c-22.1.8/Index.go +++ b/tool/_testc/clang-c-22.1.8/Index.go @@ -4,7 +4,7 @@ package clang import ( "github.com/goplus/lib/c" - "github.com/qiniu/x/bitfield" + "github.com/goplus/lib/c/bitfield" "unsafe" ) diff --git a/tool/_testc/clang-c-22.1.8/Index/out.go b/tool/_testc/clang-c-22.1.8/Index/out.go index 24484d70d..455badf57 100644 --- a/tool/_testc/clang-c-22.1.8/Index/out.go +++ b/tool/_testc/clang-c-22.1.8/Index/out.go @@ -8,7 +8,7 @@ import ( "clang/CXString" "clang/cstdlib" "github.com/goplus/lib/c" - "github.com/qiniu/x/bitfield" + "github.com/goplus/lib/c/bitfield" "unsafe" ) diff --git a/tool/_testc/clang-c-22.1.8/go.mod b/tool/_testc/clang-c-22.1.8/go.mod index 813a8c2ce..fed427a39 100644 --- a/tool/_testc/clang-c-22.1.8/go.mod +++ b/tool/_testc/clang-c-22.1.8/go.mod @@ -2,6 +2,4 @@ module clang go 1.23 -require github.com/goplus/lib v0.5.11 - -require github.com/qiniu/x v1.19.1 // indirect +require github.com/goplus/lib v0.6.1 diff --git a/tool/_testc/clang-c-22.1.8/go.sum b/tool/_testc/clang-c-22.1.8/go.sum index 1b50ef44b..af26439a6 100644 --- a/tool/_testc/clang-c-22.1.8/go.sum +++ b/tool/_testc/clang-c-22.1.8/go.sum @@ -1,4 +1,2 @@ -github.com/goplus/lib v0.5.11 h1:1KZ6pLcc4Ef6EZVk4A/LtKIi1/zQ4g9f+TEdHkdpfhg= -github.com/goplus/lib v0.5.11/go.mod h1:t4Cgs4QYbPzpI1RnYRA0iXWTgUFUuE09TrE2PvuU0VM= -github.com/qiniu/x v1.19.1 h1:Z6ZALlHMrZw/AImYjYnYKMXemasVdUF2o7riwm9TZTs= -github.com/qiniu/x v1.19.1/go.mod h1:Sx3Wy+0GI9OsX4a53mYj6A0o7mHJ94PUvraqGYb4EIs= +github.com/goplus/lib v0.6.1 h1:OrHX3lBRsK3u5Vh045bkPvCoYHXhLmEqPCINHT6qA6Y= +github.com/goplus/lib v0.6.1/go.mod h1:0krESx2ZyKMlgNp3oUMob++WJYR5a1PpubjSmMjnP0c= diff --git a/tool/_testc/python-3.14.8/go.mod b/tool/_testc/python-3.14.8/go.mod index b1c75ae9a..214eb873c 100644 --- a/tool/_testc/python-3.14.8/go.mod +++ b/tool/_testc/python-3.14.8/go.mod @@ -2,6 +2,4 @@ module github.com/llarhub/py/c go 1.23 -require github.com/goplus/lib v0.5.11 - -require github.com/qiniu/x v1.19.1 // indirect +require github.com/goplus/lib v0.6.1 diff --git a/tool/_testc/python-3.14.8/go.sum b/tool/_testc/python-3.14.8/go.sum index 1b50ef44b..af26439a6 100644 --- a/tool/_testc/python-3.14.8/go.sum +++ b/tool/_testc/python-3.14.8/go.sum @@ -1,4 +1,2 @@ -github.com/goplus/lib v0.5.11 h1:1KZ6pLcc4Ef6EZVk4A/LtKIi1/zQ4g9f+TEdHkdpfhg= -github.com/goplus/lib v0.5.11/go.mod h1:t4Cgs4QYbPzpI1RnYRA0iXWTgUFUuE09TrE2PvuU0VM= -github.com/qiniu/x v1.19.1 h1:Z6ZALlHMrZw/AImYjYnYKMXemasVdUF2o7riwm9TZTs= -github.com/qiniu/x v1.19.1/go.mod h1:Sx3Wy+0GI9OsX4a53mYj6A0o7mHJ94PUvraqGYb4EIs= +github.com/goplus/lib v0.6.1 h1:OrHX3lBRsK3u5Vh045bkPvCoYHXhLmEqPCINHT6qA6Y= +github.com/goplus/lib v0.6.1/go.mod h1:0krESx2ZyKMlgNp3oUMob++WJYR5a1PpubjSmMjnP0c= diff --git a/tool/_testcpp/llvm-22.1.8-support/go.mod b/tool/_testcpp/llvm-22.1.8-support/go.mod index 5de50e9df..7c9803f32 100644 --- a/tool/_testcpp/llvm-22.1.8-support/go.mod +++ b/tool/_testcpp/llvm-22.1.8-support/go.mod @@ -3,9 +3,7 @@ module llvm go 1.23 require ( - github.com/goplus/lib v0.5.11 + github.com/goplus/lib v0.6.1 github.com/llarhub/libcxx v0.1.1 github.com/llarhub/llvm-c v0.2.0 ) - -require github.com/qiniu/x v1.19.1 // indirect diff --git a/tool/_testcpp/llvm-22.1.8-support/go.sum b/tool/_testcpp/llvm-22.1.8-support/go.sum index f7ac2b52a..baa8a95a4 100644 --- a/tool/_testcpp/llvm-22.1.8-support/go.sum +++ b/tool/_testcpp/llvm-22.1.8-support/go.sum @@ -1,8 +1,6 @@ -github.com/goplus/lib v0.5.11 h1:1KZ6pLcc4Ef6EZVk4A/LtKIi1/zQ4g9f+TEdHkdpfhg= -github.com/goplus/lib v0.5.11/go.mod h1:t4Cgs4QYbPzpI1RnYRA0iXWTgUFUuE09TrE2PvuU0VM= +github.com/goplus/lib v0.6.1 h1:OrHX3lBRsK3u5Vh045bkPvCoYHXhLmEqPCINHT6qA6Y= +github.com/goplus/lib v0.6.1/go.mod h1:0krESx2ZyKMlgNp3oUMob++WJYR5a1PpubjSmMjnP0c= github.com/llarhub/libcxx v0.1.1 h1:pq/qd3sgtDsima+rrgwOEHYGd/YnyePe6p86rHFD+Xs= github.com/llarhub/libcxx v0.1.1/go.mod h1:5ANUOJMknbqPXhwxbXnLLA8NbHHyfYWUVQNCPiz04f8= github.com/llarhub/llvm-c v0.2.0 h1:KXSm+1A9AjyxOcVTtZnlgvWDaWwBySMR27xSouaOaGg= github.com/llarhub/llvm-c v0.2.0/go.mod h1:5Z6A6u+TghfHdA82zNAhYZHlUkzra7YdUJWc8q3IoJ4= -github.com/qiniu/x v1.19.1 h1:Z6ZALlHMrZw/AImYjYnYKMXemasVdUF2o7riwm9TZTs= -github.com/qiniu/x v1.19.1/go.mod h1:Sx3Wy+0GI9OsX4a53mYj6A0o7mHJ94PUvraqGYb4EIs=