Skip to content

Commit 7afa84e

Browse files
bors[bot]lnicola
andauthored
Merge #10415
10415: minor: Bump deps r=lnicola a=lnicola Hopefully the new `libc` works now. The FreeBSD issue was fixed in rust-lang/rust#88676. Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
2 parents acb565e + 035cb44 commit 7afa84e

File tree

6 files changed

+42
-44
lines changed

6 files changed

+42
-44
lines changed

Cargo.lock

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

crates/proc_macro_api/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ doctest = false
1212
serde = { version = "1.0", features = ["derive"] }
1313
serde_json = { version = "1.0", features = ["unbounded_depth"] }
1414
tracing = "0.1"
15-
memmap2 = "0.3.0"
15+
memmap2 = "0.5"
1616
snap = "1.0"
1717

1818
paths = { path = "../paths", version = "0.0.0" }
@@ -25,4 +25,4 @@ profile = { path = "../profile", version = "0.0.0" }
2525
[dependencies.object]
2626
version = "0.26"
2727
default-features = false
28-
features = [ "std", "read_core", "elf", "macho", "pe" ]
28+
features = ["std", "read_core", "elf", "macho", "pe"]

crates/proc_macro_srv/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ object = { version = "0.26", default-features = false, features = [
1717
"pe",
1818
] }
1919
libloading = "0.7.0"
20-
memmap2 = "0.3.0"
20+
memmap2 = "0.5"
2121

2222
tt = { path = "../tt", version = "0.0.0" }
2323
mbe = { path = "../mbe", version = "0.0.0" }

crates/profile/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ doctest = false
1111
[dependencies]
1212
once_cell = "1.3.1"
1313
cfg-if = "1"
14-
# build issues on freebsd, see https://github.com/rust-analyzer/rust-analyzer/pull/10145#issuecomment-912925976
15-
libc = "=0.2.99"
14+
libc = "0.2"
1615
la-arena = { version = "0.2.0", path = "../../lib/arena" }
1716
countme = { version = "2.0.1", features = ["enable"] }
1817
jemalloc-ctl = { version = "0.4.1", package = "tikv-jemalloc-ctl", optional = true }

crates/stdx/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ edition = "2018"
99
doctest = false
1010

1111
[dependencies]
12-
# build issues on freebsd, see https://github.com/rust-analyzer/rust-analyzer/pull/10145#issuecomment-912925976
13-
libc = "=0.2.99"
12+
libc = "0.2"
1413
backtrace = { version = "0.3.44", optional = true }
1514
always-assert = { version = "0.1.2", features = ["log"] }
1615
# Think twice before adding anything here

crates/vfs-notify/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ tracing = "0.1"
1313
jod-thread = "0.1.0"
1414
walkdir = "2.3.1"
1515
crossbeam-channel = "0.5.0"
16-
notify = "=5.0.0-pre.12"
16+
notify = "=5.0.0-pre.13"
1717

1818
vfs = { path = "../vfs", version = "0.0.0" }
1919
paths = { path = "../paths", version = "0.0.0" }

0 commit comments

Comments
 (0)