diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6963ee5f7c..fe45a1d71b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -316,7 +316,7 @@ jobs: with: components: clippy - name: run clippy on wasm - run: cargo clippy --manifest-path=wasm/lib/Cargo.toml -- -Dwarnings + run: cargo clippy --manifest-path=crates/wasm/Cargo.toml -- -Dwarnings - uses: actions/setup-python@v6 with: python-version: ${{ env.PYTHON_VERSION }} diff --git a/Cargo.toml b/Cargo.toml index 0773e8a410..53d1eb6ea2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -124,7 +124,6 @@ template = "installer-config/installer.wxs" resolver = "2" members = [ ".", - "wasm/lib", "crates/*", ] diff --git a/wasm/lib/.cargo/config.toml b/crates/wasm/.cargo/config.toml similarity index 100% rename from wasm/lib/.cargo/config.toml rename to crates/wasm/.cargo/config.toml diff --git a/wasm/lib/Cargo.toml b/crates/wasm/Cargo.toml similarity index 100% rename from wasm/lib/Cargo.toml rename to crates/wasm/Cargo.toml diff --git a/wasm/lib/Lib/_microdistlib.py b/crates/wasm/Lib/_microdistlib.py similarity index 100% rename from wasm/lib/Lib/_microdistlib.py rename to crates/wasm/Lib/_microdistlib.py diff --git a/wasm/lib/Lib/asyncweb.py b/crates/wasm/Lib/asyncweb.py similarity index 100% rename from wasm/lib/Lib/asyncweb.py rename to crates/wasm/Lib/asyncweb.py diff --git a/wasm/lib/Lib/browser.py b/crates/wasm/Lib/browser.py similarity index 100% rename from wasm/lib/Lib/browser.py rename to crates/wasm/Lib/browser.py diff --git a/wasm/lib/Lib/whlimport.py b/crates/wasm/Lib/whlimport.py similarity index 100% rename from wasm/lib/Lib/whlimport.py rename to crates/wasm/Lib/whlimport.py diff --git a/wasm/lib/README.md b/crates/wasm/README.md similarity index 100% rename from wasm/lib/README.md rename to crates/wasm/README.md diff --git a/wasm/lib/src/browser_module.rs b/crates/wasm/src/browser_module.rs similarity index 100% rename from wasm/lib/src/browser_module.rs rename to crates/wasm/src/browser_module.rs diff --git a/wasm/lib/src/convert.rs b/crates/wasm/src/convert.rs similarity index 100% rename from wasm/lib/src/convert.rs rename to crates/wasm/src/convert.rs diff --git a/wasm/lib/src/js_module.rs b/crates/wasm/src/js_module.rs similarity index 100% rename from wasm/lib/src/js_module.rs rename to crates/wasm/src/js_module.rs diff --git a/wasm/lib/src/lib.rs b/crates/wasm/src/lib.rs similarity index 100% rename from wasm/lib/src/lib.rs rename to crates/wasm/src/lib.rs diff --git a/wasm/lib/src/vm_class.rs b/crates/wasm/src/vm_class.rs similarity index 100% rename from wasm/lib/src/vm_class.rs rename to crates/wasm/src/vm_class.rs diff --git a/wasm/lib/src/wasm_builtins.rs b/crates/wasm/src/wasm_builtins.rs similarity index 100% rename from wasm/lib/src/wasm_builtins.rs rename to crates/wasm/src/wasm_builtins.rs diff --git a/wasm/demo/webpack.config.js b/wasm/demo/webpack.config.js index 75fb6786e6..6c798d2ca4 100644 --- a/wasm/demo/webpack.config.js +++ b/wasm/demo/webpack.config.js @@ -18,7 +18,7 @@ module.exports = (env = {}) => { alias: { rustpython: path.resolve( __dirname, - env.rustpythonPkg || '../lib/pkg', + env.rustpythonPkg || '../../crates/wasm/pkg', ), }, }, @@ -65,7 +65,7 @@ module.exports = (env = {}) => { if (!env.noWasmPack) { config.plugins.push( new WasmPackPlugin({ - crateDirectory: path.join(__dirname, '../lib'), + crateDirectory: path.join(__dirname, '../../crates/wasm'), }), ); } diff --git a/wasm/notebook/webpack.config.js b/wasm/notebook/webpack.config.js index ca19f3384a..a3e3f8ef71 100644 --- a/wasm/notebook/webpack.config.js +++ b/wasm/notebook/webpack.config.js @@ -18,7 +18,7 @@ module.exports = (env = {}) => { alias: { rustpython: path.resolve( __dirname, - env.rustpythonPkg || '../lib/pkg', + env.rustpythonPkg || '../../crates/wasm/pkg', ), }, },