aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock28
-rw-r--r--src/lix-doc/Cargo.toml2
-rw-r--r--src/lix-doc/meson.build4
-rw-r--r--subprojects/dissimilar-rs.wrap8
-rw-r--r--subprojects/expect-test-rs.wrap8
-rw-r--r--subprojects/rowan-rs.wrap8
6 files changed, 19 insertions, 39 deletions
diff --git a/Cargo.lock b/Cargo.lock
index e82e138f5..cf93e2dd4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3,12 +3,6 @@
version = 3
[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
name = "countme"
version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -16,15 +10,15 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
[[package]]
name = "dissimilar"
-version = "1.0.7"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632"
+checksum = "59f8e79d1fbf76bdfbde321e902714bf6c49df88a7dda6fc682fc2979226962d"
[[package]]
name = "expect-test"
-version = "1.4.1"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3"
+checksum = "9e0be0a561335815e06dab7c62e50353134c796e7a6155402a64bcff66b6a5e0"
dependencies = [
"dissimilar",
"once_cell",
@@ -46,15 +40,6 @@ dependencies = [
]
[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
name = "once_cell"
version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -71,13 +56,12 @@ dependencies = [
[[package]]
name = "rowan"
-version = "0.15.15"
+version = "0.15.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49"
+checksum = "0a542b0253fa46e632d27a1dc5cf7b930de4df8659dc6e720b647fc72147ae3d"
dependencies = [
"countme",
"hashbrown",
- "memoffset",
"rustc-hash",
"text-size",
]
diff --git a/src/lix-doc/Cargo.toml b/src/lix-doc/Cargo.toml
index 02494862f..b52e6bb3b 100644
--- a/src/lix-doc/Cargo.toml
+++ b/src/lix-doc/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/lf-/nix-doc"
[dependencies]
rnix = "0.11.0"
# Necessary because rnix fails to export a critical trait (Rowan's AstNode).
-rowan = "0.15.0"
+rowan = "0.15.16"
[dev-dependencies]
expect-test = "1.1.0"
diff --git a/src/lix-doc/meson.build b/src/lix-doc/meson.build
index 9838984a5..132feebf3 100644
--- a/src/lix-doc/meson.build
+++ b/src/lix-doc/meson.build
@@ -1,5 +1,3 @@
-# The external crate rowan has an ambiguous pointer comparison warning, which
-# we don't want to fail our whole build if werror is on.
# FIXME: remove hack once we get rid of meson 1.4
rnix_name = 'rnix-0.11-rs'
rowan_name = 'rowan-0.15-rs'
@@ -8,8 +6,6 @@ if meson.version().version_compare('< 1.5')
rowan_name = 'rowan-rs'
endif
-subproject(rowan_name, default_options : ['werror=false'])
-
rnix = dependency(rnix_name)
rowan = dependency(rowan_name)
diff --git a/subprojects/dissimilar-rs.wrap b/subprojects/dissimilar-rs.wrap
index a51407482..5617b775b 100644
--- a/subprojects/dissimilar-rs.wrap
+++ b/subprojects/dissimilar-rs.wrap
@@ -1,6 +1,6 @@
[wrap-file]
method = cargo
-directory = dissimilar-1.0.7
-source_url = https://crates.io/api/v1/crates/dissimilar/1.0.7/download
-source_filename = dissimilar-1.0.7.tar.gz
-source_hash = 86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632
+directory = dissimilar-1.0.9
+source_url = https://crates.io/api/v1/crates/dissimilar/1.0.9/download
+source_filename = dissimilar-1.0.9.tar.gz
+source_hash = 59f8e79d1fbf76bdfbde321e902714bf6c49df88a7dda6fc682fc2979226962d
diff --git a/subprojects/expect-test-rs.wrap b/subprojects/expect-test-rs.wrap
index 1e2a4a3b9..701c5f0c5 100644
--- a/subprojects/expect-test-rs.wrap
+++ b/subprojects/expect-test-rs.wrap
@@ -1,6 +1,6 @@
[wrap-file]
method = cargo
-directory = expect-test-1.4.1
-source_url = https://crates.io/api/v1/crates/expect-test/1.4.1/download
-source_filename = expect-test-1.4.1.tar.gz
-source_hash = 30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3
+directory = expect-test-1.5.0
+source_url = https://crates.io/api/v1/crates/expect-test/1.5.0/download
+source_filename = expect-test-1.5.0.tar.gz
+source_hash = 9e0be0a561335815e06dab7c62e50353134c796e7a6155402a64bcff66b6a5e0
diff --git a/subprojects/rowan-rs.wrap b/subprojects/rowan-rs.wrap
index f6ab76d69..1baf3f9f2 100644
--- a/subprojects/rowan-rs.wrap
+++ b/subprojects/rowan-rs.wrap
@@ -1,6 +1,6 @@
[wrap-file]
method = cargo
-directory = rowan-0.15.15
-source_url = https://crates.io/api/v1/crates/rowan/0.15.15/download
-source_filename = rowan-0.15.15.tar.gz
-source_hash = 32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49
+directory = rowan-0.15.16
+source_url = https://crates.io/api/v1/crates/rowan/0.15.16/download
+source_filename = rowan-0.15.16.tar.gz
+source_hash = 0a542b0253fa46e632d27a1dc5cf7b930de4df8659dc6e720b647fc72147ae3d