Use corrosion instead of CMakeRust

djmitche · Feb 19, 2024 · 0d8c415 · 0d8c415
1 parent 34c0e67
commit 0d8c415
Show file tree

Hide file tree

Showing 46 changed files with 30 additions and 2,780 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,4 @@ tutorials
 .prove
 /target/
 /.idea/
+cargo
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "src/libshared"]
 	path = src/libshared
 	url = https://github.com/GothenburgBitFactory/libshared.git
+[submodule "corrosion"]
+	path = corrosion
+	url = https://github.com/corrosion-rs/corrosion.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,8 +1,8 @@
-cmake_minimum_required (VERSION 3.0)
-set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_SOURCE_DIR}/cmake/CMakeRust/cmake")
+cmake_minimum_required (VERSION 3.5)
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
+
+add_subdirectory(corrosion)
 
-enable_language (Rust)
-include (CMakeCargo)
 include (CheckFunctionExists)
 include (CheckStructHasMember)
 
@@ -138,7 +138,6 @@ configure_file (
 add_subdirectory (src)
 add_subdirectory (src/commands)
 add_subdirectory (src/tc)
-add_subdirectory (src/tc/rust)
 add_subdirectory (src/columns)
 add_subdirectory (doc)
 add_subdirectory (scripts)

diff --git a/cmake/CMakeRust/.github/CODEOWNERS b/cmake/CMakeRust/.github/CODEOWNERS
diff --git a/cmake/CMakeRust/.gitignore b/cmake/CMakeRust/.gitignore
diff --git a/cmake/CMakeRust/CMakeLists.txt b/cmake/CMakeRust/CMakeLists.txt
diff --git a/cmake/CMakeRust/LICENSE-APACHE b/cmake/CMakeRust/LICENSE-APACHE
diff --git a/cmake/CMakeRust/LICENSE-MIT b/cmake/CMakeRust/LICENSE-MIT
diff --git a/cmake/CMakeRust/cmake/CMakeCargo.cmake b/cmake/CMakeRust/cmake/CMakeCargo.cmake
diff --git a/cmake/CMakeRust/cmake/CMakeDetermineRustCompiler.cmake b/cmake/CMakeRust/cmake/CMakeDetermineRustCompiler.cmake
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,3 +25,4 @@ tutorials @@
     .prove
     /target/
     /.idea/
+    cargo