diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 921eadea2..d7336b982 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -73,13 +73,22 @@ jobs:
   ubuntu-asan:
 
     runs-on: ubuntu-latest
+    env:
+        # Rust has two different memory sanitizers of interest; they can't be used at the same time:
+        # * AddressSanitizer detects out-of-bound access, use-after-free, use-after-return,
+        #   use-after-scope, double-free, invalid-free, and memory leaks.
+        # * MemorySanitizer detects uninitialized reads.
+        #
+        RUSTFLAGS: "-Zsanitizer=address"
+        # RUSTFLAGS: "-Zsanitizer=memory -Zsanitizer-memory-track-origins"
 
     steps:
     - uses: actions/checkout@v3
     - name: SetupRust
       uses: ATiltedTree/setup-rust@v1
       with:
-        rust-version: 1.67
+        # All -Z options require running nightly
+        rust-version: nightly
     - name: Install deps
       run: |
         sudo apt install gettext libncurses5-dev libpcre2-dev python3-pip tmux
@@ -91,7 +100,9 @@ jobs:
           CXXFLAGS: "-fno-omit-frame-pointer -fsanitize=undefined -fsanitize=address -DFISH_CI_SAN"
       run: |
         mkdir build && cd build
-        cmake ..
+        # Rust's ASAN requires the build system to explicitly pass a --target triple. We read that
+        # value from CMake variable Rust_CARGO_TARGET (shared with corrosion).
+        cmake .. -DASAN=1 -DRust_CARGO_TARGET=x86_64-unknown-linux-gnu
     - name: make
       run: |
         make
diff --git a/cmake/Rust.cmake b/cmake/Rust.cmake
index fc1b8a3b9..8ff46cdb5 100644
--- a/cmake/Rust.cmake
+++ b/cmake/Rust.cmake
@@ -5,7 +5,7 @@ set(CORROSION_TESTS OFF CACHE BOOL "" FORCE)
 
 FetchContent_Declare(
     Corrosion
-    GIT_REPOSITORY https://github.com/ridiculousfish/corrosion
+    GIT_REPOSITORY https://github.com/mqudsi/corrosion
     GIT_TAG fish
 )
 
diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake
index cfaae13b9..68d87c6b1 100644
--- a/cmake/Tests.cmake
+++ b/cmake/Tests.cmake
@@ -177,17 +177,32 @@ foreach(PEXPECT ${PEXPECTS})
 endforeach(PEXPECT)
 
 # Rust stuff.
-add_test(
-    NAME "cargo-test"
-    COMMAND cargo test --target-dir target
-    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/fish-rust"
-)
-set_tests_properties("cargo-test" PROPERTIES SKIP_RETURN_CODE ${SKIP_RETURN_CODE})
-add_test_target("cargo-test")
+if(DEFINED ASAN)
+    # Rust w/ -Zsanitizer=address requires explicitly specifying the --target triple or else linker
+    # errors pertaining to asan symbols will ensue.
+    if(NOT DEFINED Rust_CARGO_TARGET)
+        message(FATAL_ERROR "ASAN requires defining the CMake variable Rust_CARGO_TARGET to the
+            intended target triple")
+    endif()
+    set(cargo_target_opt "--target" ${Rust_CARGO_TARGET})
+endif()
+
+# cargo-test is failing to link w/ ASAN enabled. For some reason it is picking up autocxx ffi
+# dependencies, even though `carg test` is supposed to be for rust-only code w/ no ffi dependencies.
+# TODO: Figure this out and fix it.
+if(NOT DEFINED ASAN)
+    add_test(
+        NAME "cargo-test"
+        COMMAND cargo test --target-dir target ${cargo_target_opt}
+        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/fish-rust"
+    )
+    set_tests_properties("cargo-test" PROPERTIES SKIP_RETURN_CODE ${SKIP_RETURN_CODE})
+    add_test_target("cargo-test")
+endif()
 
 add_test(
     NAME "cargo-test-widestring"
-    COMMAND cargo test --target-dir target
+    COMMAND cargo test --target-dir target ${cargo_target_opt}
     WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/fish-rust/widestring-suffix/"
 )
 add_test_target("cargo-test-widestring")