From e1621e77f0000ce2aeba830c217f5eb59f9ba90f Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Thu, 20 Apr 2023 18:56:48 +0200
Subject: [PATCH 1/2] Move clippy_wasm/clippy.toml to under scripts

This is just to clean up the root a bit, and to move it closer
to where it is actually used.
---
 clippy.toml                                      | 4 ++--
 scripts/clippy_wasm.sh                           | 4 ++--
 {clippy_wasm => scripts/clippy_wasm}/clippy.toml | 0
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename {clippy_wasm => scripts/clippy_wasm}/clippy.toml (100%)

diff --git a/clippy.toml b/clippy.toml
index 4da41d009fbc..986c4249da08 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -1,4 +1,4 @@
-# There is also a clippy_wasm/clippy.toml which forbids some mthods that are not available in wasm.
+# There is also a scripts/clippy_wasm/clippy.toml which forbids some mthods that are not available in wasm.
 
 msrv = "1.67"
 
@@ -47,7 +47,7 @@ disallowed-types = [
 
 # Allow-list of words for markdown in dosctrings https://rust-lang.github.io/rust-clippy/master/index.html#doc_markdown
 doc-valid-idents = [
-  # You must also update the same list in `clippy_wasm/clippy.toml`!
+  # You must also update the same list in `scripts/clippy_wasm/clippy.toml`!
   "GitHub",
   "GLB",
   "GLTF",
diff --git a/scripts/clippy_wasm.sh b/scripts/clippy_wasm.sh
index ae721847078e..107a6c96049a 100755
--- a/scripts/clippy_wasm.sh
+++ b/scripts/clippy_wasm.sh
@@ -7,7 +7,7 @@ script_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
 cd "$script_path/.."
 set -x
 
-# Use clippy_wasm/clippy.toml
-export CLIPPY_CONF_DIR="clippy_wasm"
+# Use scripts/clippy_wasm/clippy.toml
+export CLIPPY_CONF_DIR="scripts/clippy_wasm"
 
 cargo cranky --all-features --target wasm32-unknown-unknown --target-dir target_wasm -p re_viewer -- --deny warnings
diff --git a/clippy_wasm/clippy.toml b/scripts/clippy_wasm/clippy.toml
similarity index 100%
rename from clippy_wasm/clippy.toml
rename to scripts/clippy_wasm/clippy.toml

From b1eb52ca2a6d7c726f33ef4571d2016dc3cc62e3 Mon Sep 17 00:00:00 2001
From: Andreas Reich <andreas@rerun.io>
Date: Fri, 21 Apr 2023 16:23:18 +0200
Subject: [PATCH 2/2] Fix comment typo

---
 clippy.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clippy.toml b/clippy.toml
index 986c4249da08..bd8f68dcbf99 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -1,4 +1,4 @@
-# There is also a scripts/clippy_wasm/clippy.toml which forbids some mthods that are not available in wasm.
+# There is also a scripts/clippy_wasm/clippy.toml which forbids some methods that are not available in wasm.
 
 msrv = "1.67"