Skip to content

Commit 3aae1cd

Browse files
authored
Fix incorrect salsa return_ref attribute (#18605)
1 parent 5dcfc9f commit 3aae1cd

4 files changed

Lines changed: 29 additions & 32 deletions

File tree

Cargo.lock

Lines changed: 23 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ regex = { version = "1.10.2" }
129129
rustc-hash = { version = "2.0.0" }
130130
rustc-stable-hash = { version = "0.1.2" }
131131
# When updating salsa, make sure to also update the revision in `fuzz/Cargo.toml`
132-
salsa = { git = "https://github.com/carljm/salsa.git", rev = "0f6d406f6c309964279baef71588746b8c67b4a3" }
132+
salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "dc9066d66723d5842fcf78aa5725691a9168703f" }
133133
schemars = { version = "0.8.16" }
134134
seahash = { version = "4.1.0" }
135135
serde = { version = "1.0.197", features = ["derive"] }
@@ -165,7 +165,7 @@ tracing-subscriber = { version = "0.3.18", default-features = false, features =
165165
"env-filter",
166166
"fmt",
167167
"ansi",
168-
"smallvec"
168+
"smallvec",
169169
] }
170170
tryfn = { version = "0.2.1" }
171171
typed-arena = { version = "2.0.2" }
@@ -175,11 +175,7 @@ unicode-width = { version = "0.2.0" }
175175
unicode_names2 = { version = "1.2.2" }
176176
unicode-normalization = { version = "0.1.23" }
177177
url = { version = "2.5.0" }
178-
uuid = { version = "1.6.1", features = [
179-
"v4",
180-
"fast-rng",
181-
"macro-diagnostics",
182-
] }
178+
uuid = { version = "1.6.1", features = ["v4", "fast-rng", "macro-diagnostics"] }
183179
walkdir = { version = "2.3.2" }
184180
wasm-bindgen = { version = "0.2.92" }
185181
wasm-bindgen-test = { version = "0.3.42" }
@@ -214,8 +210,8 @@ must_use_candidate = "allow"
214210
similar_names = "allow"
215211
single_match_else = "allow"
216212
too_many_lines = "allow"
217-
needless_continue = "allow" # An explicit continue can be more readable, especially if the alternative is an empty block.
218-
unnecessary_debug_formatting = "allow" # too many instances, the display also doesn't quote the path which is often desired in logs where we use them the most often.
213+
needless_continue = "allow" # An explicit continue can be more readable, especially if the alternative is an empty block.
214+
unnecessary_debug_formatting = "allow" # too many instances, the display also doesn't quote the path which is often desired in logs where we use them the most often.
219215
# Without the hashes we run into a `rustfmt` bug in some snapshot tests, see #13250
220216
needless_raw_string_hashes = "allow"
221217
# Disallowed restriction lints

crates/ty_python_semantic/src/types.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8120,7 +8120,6 @@ impl<'db> From<SuperOwnerKind<'db>> for Type<'db> {
81208120
#[salsa::interned(debug)]
81218121
pub struct BoundSuperType<'db> {
81228122
pub pivot_class: ClassBase<'db>,
8123-
#[return_ref]
81248123
pub owner: SuperOwnerKind<'db>,
81258124
}
81268125

fuzz/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ty_python_semantic = { path = "../crates/ty_python_semantic" }
3030
ty_vendored = { path = "../crates/ty_vendored" }
3131

3232
libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer", default-features = false }
33-
salsa = { git = "https://github.com/carljm/salsa.git", rev = "0f6d406f6c309964279baef71588746b8c67b4a3" }
33+
salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "dc9066d66723d5842fcf78aa5725691a9168703f" }
3434
similar = { version = "2.5.0" }
3535
tracing = { version = "0.1.40" }
3636

0 commit comments

Comments
 (0)