Skip to content

Commit 975f019

Browse files
committed
MUST REVERT: Temporarily use a custom salsa
1 parent a40ea26 commit 975f019

File tree

7 files changed

+8
-10
lines changed

7 files changed

+8
-10
lines changed

Cargo.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/common2/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ description = "Provides HIR definition and lowering for Fe lang."
1313
semver = "1.0.17"
1414
camino = "1.1.4"
1515
smol_str = "0.1.24"
16-
salsa = { git = "https://github.com/salsa-rs/salsa", rev = "a1bf3a6" }
16+
salsa = { git = "https://github.com/Y-Nak/salsa", branch = "fix-salsa3.0-pre" }
1717
indexmap = "2.2"
1818
parser = { path = "../parser2", package = "fe-parser2" }

crates/driver2/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ description = "Provides Fe driver"
1010
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1111

1212
[dependencies]
13-
salsa = { git = "https://github.com/salsa-rs/salsa", rev = "a1bf3a6" }
13+
salsa = { git = "https://github.com/Y-Nak/salsa", branch = "fix-salsa3.0-pre" }
1414
codespan-reporting = "0.11"
1515

1616
hir = { path = "../hir", package = "fe-hir" }

crates/hir-analysis/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repository = "https://github.com/ethereum/fe"
88
description = "Provides HIR semantic analysis for Fe lang"
99

1010
[dependencies]
11-
salsa = { git = "https://github.com/salsa-rs/salsa", rev = "a1bf3a6" }
11+
salsa = { git = "https://github.com/Y-Nak/salsa", branch = "fix-salsa3.0-pre" }
1212
smallvec = "1.10"
1313
rustc-hash = "1.1.0"
1414
either = "1.8"

crates/hir/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repository = "https://github.com/ethereum/fe"
88
description = "Provides HIR definition and lowering for Fe lang"
99

1010
[dependencies]
11-
salsa = { git = "https://github.com/salsa-rs/salsa", rev = "a1bf3a6" }
11+
salsa = { git = "https://github.com/Y-Nak/salsa", branch = "fix-salsa3.0-pre" }
1212
derive_more = "0.99"
1313
cranelift-entity = "0.91"
1414
num-bigint = "0.4"

crates/language-server/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ description = "An LSP language server for Fe lang"
1010
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1111

1212
[dependencies]
13-
salsa = { git = "https://github.com/salsa-rs/salsa", rev = "a1bf3a6" }
13+
salsa = { git = "https://github.com/Y-Nak/salsa", branch = "fix-salsa3.0-pre" }
1414
codespan-reporting = "0.11"
1515
act-locally = "0.1.1"
1616
hir = { path = "../hir", package = "fe-hir" }

crates/uitest/fixtures/ty_check/pat/record.snap

+1-3
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,5 @@ error[8-0011]: all fields are not given
7676
22let Bar::Variant {}
7777
^^
7878
│ │
79-
missing `x, y`
79+
missing `y, x`
8080
Consider using `Bar::Variant { x, y }` instead
81-
82-

0 commit comments

Comments
 (0)