Fixing others

* Make Rust rotate code smaller

* Back on the rust happy path

codecs/rotate/.gitignore

@@ -0,0 +1,2 @@
+target
+Cargo.lock

codecs/rotate/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "rotate"
+version = "0.1.0"
+authors = ["Surma <surma@google.com>"]
+edition = "2018"
+
+[lib]
+name = "rotate"
+path = "rotate.rs"
+crate-type = ["cdylib", "rlib"]
+
+[profile.release]
+lto = true
+opt-level = "s"

codecs/rotate/build.sh

@@ -7,12 +7,11 @@ echo "Compiling wasm"
 echo "============================================="
 (
   rustup run nightly \
-    rustc \
+    cargo build \
-    --target=wasm32-unknown-unknown \
+    --target wasm32-unknown-unknown \
-    -C opt-level=3 \
+    --release
-    -o rotate.wasm \
+  cp target/wasm32-unknown-unknown/release/rotate.wasm .
-    rotate.rs
+  wasm-strip rotate.wasm
-    wasm-strip rotate.wasm
 )
 echo "============================================="
 echo "Compiling wasm  done"

codecs/rotate/rotate.rs

@@ -1,8 +1,22 @@
-#![no_std]
+use std::slice::from_raw_parts_mut;
-#![no_main]
 
-use core::panic::PanicInfo;
+// This function is taken from
-use core::slice::from_raw_parts_mut;
+// https://rustwasm.github.io/book/reference/code-size.html
+#[cfg(not(debug_assertions))]
+#[inline]
+pub fn unwrap_abort<T>(o: Option<T>) -> T {
+    use std::process;
+    match o {
+        Some(t) => t,
+        None => process::abort(),
+    }
+}
+
+// Normal panic-y behavior for debug builds
+#[cfg(debug_assertions)]
+unsafe fn unchecked_unwrap<T>(o: Option<T>) -> T {
+    o.unwrap()
+}
 
 #[no_mangle]
 fn rotate(input_width: isize, input_height: isize, rotate: isize) {
@@ -69,13 +83,8 @@ fn rotate(input_width: isize, input_height: isize, rotate: isize) {
   for d2 in 0..d2_limit {
     for d1 in 0..d1_limit {
       let in_idx = (d1_start + d1 * d1_advance) * d1_multiplier + (d2_start + d2 * d2_advance) * d2_multiplier;
-      out_b[i as usize] = in_b[in_idx as usize];
+      *unwrap_abort(out_b.get_mut(i as usize)) = *unwrap_abort(in_b.get(in_idx as usize));
       i += 1;
     }
   }
 }
-
-#[panic_handler]
-fn panic(_info: &PanicInfo) -> ! {
-  loop {}
-}

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "squoosh",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "license": "apache-2.0",
   "scripts": {
     "start": "webpack-dev-server --host 0.0.0.0 --hot",
@@ -16,13 +16,13 @@
     }
   },
   "devDependencies": {
-    "@types/node": "10.12.23",
+    "@types/node": "10.12.26",
     "@types/pretty-bytes": "5.1.0",
     "@types/webassembly-js-api": "0.0.2",
     "@webcomponents/custom-elements": "1.2.1",
     "@webpack-cli/serve": "0.1.3",
     "assets-webpack-plugin": "3.9.7",
-    "chokidar": "2.1.0",
+    "chokidar": "2.1.1",
     "chalk": "2.4.2",
     "classnames": "2.2.6",
     "clean-webpack-plugin": "1.0.1",
@@ -67,7 +67,7 @@
     "typescript": "3.2.4",
     "url-loader": "1.1.2",
     "webpack": "4.28.0",
-    "webpack-bundle-analyzer": "3.0.3",
+    "webpack-bundle-analyzer": "3.0.4",
     "webpack-cli": "3.2.3",
     "webpack-dev-server": "3.1.14",
     "worker-plugin": "3.0.0"

webpack.config.js

@@ -17,6 +17,8 @@ const CrittersPlugin = require('critters-webpack-plugin');
 const AssetTemplatePlugin = require('./config/asset-template-plugin');
 const addCssTypes = require('./config/add-css-types');
 
+const regexpPathSep = path.sep === '\\' ? '\\\\' : '/';
+
 function readJson (filename) {
   return JSON.parse(fs.readFileSync(filename));
 }
@@ -38,7 +40,7 @@ module.exports = async function (_, env) {
   return {
     mode: isProd ? 'production' : 'development',
     entry: {
-      'first-interaction': './src/index'
+      'first-interaction': path.join('.', 'src', 'index'),
     },
     devtool: isProd ? 'source-map' : 'inline-source-map',
     stats: 'minimal',
@@ -52,13 +54,13 @@ module.exports = async function (_, env) {
     resolve: {
       extensions: ['.ts', '.tsx', '.mjs', '.js', '.scss', '.css'],
       alias: {
-        style: path.join(__dirname, 'src/style')
+        style: path.join(__dirname, 'src', 'style')
       }
     },
     resolveLoader: {
       alias: {
         // async-component-loader returns a wrapper component that waits for the import to load before rendering:
-        async: path.join(__dirname, 'config/async-component-loader')
+        async: path.join(__dirname, 'config', 'async-component-loader')
       }
     },
     module: {
@@ -147,11 +149,11 @@ module.exports = async function (_, env) {
         },
         {
           // All the codec files define a global with the same name as their file name. `exports-loader` attaches those to `module.exports`.
-          test: /\/codecs\/.*\.js$/,
+          test: new RegExp(`${regexpPathSep}codecs${regexpPathSep}.*\.js`),
           loader: 'exports-loader'
         },
         {
-          test: /\/codecs\/.*\.wasm$/,
+          test: new RegExp(`${regexpPathSep}codecs${regexpPathSep}.*\.wasm`),
           // This is needed to make webpack NOT process wasm files.
           // See https://github.com/webpack/webpack/issues/6725
           type: 'javascript/auto',
@@ -172,7 +174,7 @@ module.exports = async function (_, env) {
     plugins: [
       new webpack.IgnorePlugin(
         /(fs|crypto|path)/,
-        new RegExp(`${path.sep}codecs${path.sep}`)
+        new RegExp(`${regexpPathSep}codecs${regexpPathSep}`)
       ),
 
       // Pretty progressbar showing build progress: