diff options
| author | bors <bors@rust-lang.org> | 2023-08-22 10:20:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-22 10:20:31 +0000 |
| commit | 9b82437de158cda02ad832db123eeb7aae862e7d (patch) | |
| tree | ef27685590f68c9f43dbc204270b2e3302e3fa18 | |
| parent | 7f659a3b2fd00f44b9e20bcc56546fe40905ac2e (diff) | |
| parent | 343ee8bacf6f4f26dd4932a3effa1785548a2e56 (diff) | |
| download | rust-9b82437de158cda02ad832db123eeb7aae862e7d.tar.gz rust-9b82437de158cda02ad832db123eeb7aae862e7d.zip | |
Auto merge of #15495 - matklad:matklad/unpin, r=lnicola
internal: unpin serde Serde no longer uses blobs as of https://github.com/serde-rs/serde/pull/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.
| -rw-r--r-- | Cargo.lock | 10 | ||||
| -rw-r--r-- | Cargo.toml | 3 | ||||
| -rw-r--r-- | lib/lsp-server/Cargo.toml | 5 |
3 files changed, 8 insertions, 10 deletions
diff --git a/Cargo.lock b/Cargo.lock index 49e96236c51..15b0e92d92d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1000,22 +1000,22 @@ checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "lsp-server" version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72417faa455bfb4e5bf14b157d8e2ca2ed74b4e89b8cf42ea2d864825ae5c8a2" dependencies = [ "crossbeam-channel", "log", - "lsp-types", "serde", "serde_json", ] [[package]] name = "lsp-server" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72417faa455bfb4e5bf14b157d8e2ca2ed74b4e89b8cf42ea2d864825ae5c8a2" +version = "0.7.4" dependencies = [ "crossbeam-channel", "log", + "lsp-types", "serde", "serde_json", ] @@ -1555,7 +1555,7 @@ dependencies = [ "ide-ssr", "itertools", "load-cargo", - "lsp-server 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "lsp-server 0.7.3", "lsp-types", "mbe", "mimalloc", diff --git a/Cargo.toml b/Cargo.toml index 5eb59d6db11..e96bba2b655 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -97,8 +97,7 @@ smallvec = { version = "1.10.0", features = [ smol_str = "0.2.0" nohash-hasher = "0.2.0" text-size = "1.1.0" -# See https://github.com/serde-rs/serde/issues/2538#issuecomment-1684517372 for why we pin serde -serde = { version = "1.0.156, < 1.0.172", features = ["derive"] } +serde = { version = "1.0.156", features = ["derive"] } serde_json = "1.0.96" triomphe = { version = "0.1.8", default-features = false, features = ["std"] } # can't upgrade due to dashmap depending on 0.12.3 currently diff --git a/lib/lsp-server/Cargo.toml b/lib/lsp-server/Cargo.toml index e1c49db39d5..7ec3247e943 100644 --- a/lib/lsp-server/Cargo.toml +++ b/lib/lsp-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lsp-server" -version = "0.7.3" +version = "0.7.4" description = "Generic LSP server scaffold." license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/rust-analyzer/tree/master/lib/lsp-server" @@ -9,8 +9,7 @@ edition = "2021" [dependencies] log = "0.4.17" serde_json = "1.0.96" -# See https://github.com/serde-rs/serde/issues/2538#issuecomment-1684517372 for why we pin serde -serde = { version = "1.0.156, < 1.0.172", features = ["derive"] } +serde = { version = "1.0.156", features = ["derive"] } crossbeam-channel = "0.5.6" [dev-dependencies] |