Skip to content

Commit 9b82437

Browse files
committed
Auto merge of #15495 - matklad:matklad/unpin, r=lnicola
internal: unpin serde Serde no longer uses blobs as of serde-rs/serde#2590 As such, there's no longer need for us to pin it. Note that this doesn't upgrade serde version we use: I am fairly confident that the blobs are already there are fine, and now I am fairly confident that all future versions of serde will be fine as well.
2 parents 7f659a3 + 343ee8b commit 9b82437

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

Cargo.lock

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

Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@ smallvec = { version = "1.10.0", features = [
9797
smol_str = "0.2.0"
9898
nohash-hasher = "0.2.0"
9999
text-size = "1.1.0"
100-
# See https://github.com/serde-rs/serde/issues/2538#issuecomment-1684517372 for why we pin serde
101-
serde = { version = "1.0.156, < 1.0.172", features = ["derive"] }
100+
serde = { version = "1.0.156", features = ["derive"] }
102101
serde_json = "1.0.96"
103102
triomphe = { version = "0.1.8", default-features = false, features = ["std"] }
104103
# can't upgrade due to dashmap depending on 0.12.3 currently

lib/lsp-server/Cargo.toml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "lsp-server"
3-
version = "0.7.3"
3+
version = "0.7.4"
44
description = "Generic LSP server scaffold."
55
license = "MIT OR Apache-2.0"
66
repository = "https://github.com/rust-lang/rust-analyzer/tree/master/lib/lsp-server"
@@ -9,8 +9,7 @@ edition = "2021"
99
[dependencies]
1010
log = "0.4.17"
1111
serde_json = "1.0.96"
12-
# See https://github.com/serde-rs/serde/issues/2538#issuecomment-1684517372 for why we pin serde
13-
serde = { version = "1.0.156, < 1.0.172", features = ["derive"] }
12+
serde = { version = "1.0.156", features = ["derive"] }
1413
crossbeam-channel = "0.5.6"
1514

1615
[dev-dependencies]

0 commit comments

Comments
 (0)