diff --git a/Cargo.lock b/Cargo.lock
index 767e1aca0..715cddccf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3426,7 +3426,7 @@ dependencies = [
 [[package]]
 name = "salsa"
 version = "0.18.0"
-source = "git+https://github.com/salsa-rs/salsa?rev=a1bf3a6#a1bf3a613f451af7fc0a59411c56abc47fe8e8e1"
+source = "git+https://github.com/Y-Nak/salsa?branch=fix-salsa3.0-pre#5a863e47bca968c558460b594534144f4b7d53d3"
 dependencies = [
  "arc-swap",
  "crossbeam",
@@ -3455,7 +3455,7 @@ dependencies = [
 [[package]]
 name = "salsa-macros"
 version = "0.18.0"
-source = "git+https://github.com/salsa-rs/salsa?rev=a1bf3a6#a1bf3a613f451af7fc0a59411c56abc47fe8e8e1"
+source = "git+https://github.com/Y-Nak/salsa?branch=fix-salsa3.0-pre#5a863e47bca968c558460b594534144f4b7d53d3"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/crates/common2/Cargo.toml b/crates/common2/Cargo.toml
index a81984c0b..8972f9e28 100644
--- a/crates/common2/Cargo.toml
+++ b/crates/common2/Cargo.toml
@@ -13,6 +13,6 @@ description = "Provides HIR definition and lowering for Fe lang."
 semver = "1.0.17"
 camino = "1.1.4"
 smol_str = "0.1.24"
-salsa = { git = "https://github.com/salsa-rs/salsa", rev = "a1bf3a6" }
+salsa = { git = "https://github.com/Y-Nak/salsa", branch = "fix-salsa3.0-pre" }
 indexmap = "2.2"
 parser = { path = "../parser2", package = "fe-parser2" }
diff --git a/crates/driver2/Cargo.toml b/crates/driver2/Cargo.toml
index 0af1b159f..9a2cf4325 100644
--- a/crates/driver2/Cargo.toml
+++ b/crates/driver2/Cargo.toml
@@ -10,7 +10,7 @@ description = "Provides Fe driver"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-salsa = { git = "https://github.com/salsa-rs/salsa", rev = "a1bf3a6" }
+salsa = { git = "https://github.com/Y-Nak/salsa", branch = "fix-salsa3.0-pre" }
 codespan-reporting = "0.11"
 
 hir = { path = "../hir", package = "fe-hir" }
diff --git a/crates/hir-analysis/Cargo.toml b/crates/hir-analysis/Cargo.toml
index 9b02d9b03..d588ce5b9 100644
--- a/crates/hir-analysis/Cargo.toml
+++ b/crates/hir-analysis/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/ethereum/fe"
 description = "Provides HIR semantic analysis for Fe lang"
 
 [dependencies]
-salsa = { git = "https://github.com/salsa-rs/salsa", rev = "a1bf3a6" }
+salsa = { git = "https://github.com/Y-Nak/salsa", branch = "fix-salsa3.0-pre" }
 smallvec = "1.10"
 rustc-hash = "1.1.0"
 either = "1.8"
diff --git a/crates/hir/Cargo.toml b/crates/hir/Cargo.toml
index 7846c3752..d9fc5cead 100644
--- a/crates/hir/Cargo.toml
+++ b/crates/hir/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/ethereum/fe"
 description = "Provides HIR definition and lowering for Fe lang"
 
 [dependencies]
-salsa = { git = "https://github.com/salsa-rs/salsa", rev = "a1bf3a6" }
+salsa = { git = "https://github.com/Y-Nak/salsa", branch = "fix-salsa3.0-pre" }
 derive_more = "0.99"
 cranelift-entity = "0.91"
 num-bigint = "0.4"
diff --git a/crates/language-server/Cargo.toml b/crates/language-server/Cargo.toml
index 78742727e..2ee564be8 100644
--- a/crates/language-server/Cargo.toml
+++ b/crates/language-server/Cargo.toml
@@ -10,7 +10,7 @@ description = "An LSP language server for Fe lang"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-salsa = { git = "https://github.com/salsa-rs/salsa", rev = "a1bf3a6" }
+salsa = { git = "https://github.com/Y-Nak/salsa", branch = "fix-salsa3.0-pre" }
 codespan-reporting = "0.11"
 act-locally = "0.1.1"
 hir = { path = "../hir", package = "fe-hir" }
diff --git a/crates/uitest/fixtures/ty_check/pat/record.snap b/crates/uitest/fixtures/ty_check/pat/record.snap
index 0f59b5556..f434ef57d 100644
--- a/crates/uitest/fixtures/ty_check/pat/record.snap
+++ b/crates/uitest/fixtures/ty_check/pat/record.snap
@@ -76,7 +76,5 @@ error[8-0011]: all fields are not given
 22 │     let Bar::Variant {}
    │                      ^^
    │                      │
-   │                      missing `x, y`
+   │                      missing `y, x`
    │                      Consider using `Bar::Variant { x, y }` instead
-
-