Use our own language-rust fork in submodule

Unfortunately, the upstream `language-rust` repo at https://github.com/harpocrates/language-rust no longer appears to be actively maintained, and without a fix for harpocrates/language-rust#44, it is impossible to build `language-rust` with GHC 9.6. This patch changes our `language-rust` submodule to instead use our fork of `language-rust` (at https://github.com/GaloisInc/language-rust). It is unclear if we will have to keep doing this in the long term, but this at least unblocks us in the short term.
GaloisInc · Nov 20, 2023 · 0c33968 · 0c33968
1 parent d9f88e0
commit 0c33968
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -42,7 +42,7 @@
 	url = https://github.com/galoisinc/argo
 [submodule "deps/language-rust"]
 	path = deps/language-rust
-	url = https://github.com/harpocrates/language-rust.git
+	url = https://github.com/GaloisInc/language-rust.git
 [submodule "deps/language-sally"]
 	path = deps/language-sally
 	url = https://github.com/GaloisInc/language-sally

diff --git a/deps/language-rust b/deps/language-rust
+2 −2		language-rust.cabal
+16 −16		src/Language/Rust/Data/Ident.hs
+4 −4		src/Language/Rust/Parser/Internal.y
+1 −1		src/Language/Rust/Parser/Lexer.x
+1 −1		src/Language/Rust/Parser/Reversed.hs
+3 −3		src/Language/Rust/Pretty.hs
+8 −4		src/Language/Rust/Pretty/Internal.hs
+1 −1		src/Language/Rust/Pretty/Literals.hs
+7 −8		src/Language/Rust/Pretty/Resolve.hs
+2 −2		src/Language/Rust/Pretty/Util.hs
+2 −2		test/rustc-tests/Diff.hs
+11 −5		test/rustc-tests/DiffUtils.hs