zebreus/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests 1 Activity

Fix tests on systems with a non-master git defaultBranch #1

Open
zebreus wants to merge 140 commits from fix-tests-without-master into main
pull from: fix-tests-without-master
merge into: zebreus:main
Conversation 0 Commits 140 Files changed 216 +19 -39
6 changed files with 19 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ca08f1217d - Show all commits

28
Cargo.lock generated
View file

@ -2,12 +2,6 @@
# It is not intended for manual editing. # It is not intended for manual editing.
version = 3 version = 3
[[package]]
name = "autocfg"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]] [[package]]
name = "countme" name = "countme"
version = "3.0.1" version = "3.0.1"
@ -16,15 +10,15 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
[[package]] [[package]]
name = "dissimilar" name = "dissimilar"
version = "1.0.7" version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" checksum = "59f8e79d1fbf76bdfbde321e902714bf6c49df88a7dda6fc682fc2979226962d"
[[package]] [[package]]
name = "expect-test" name = "expect-test"
version = "1.4.1" version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3" checksum = "9e0be0a561335815e06dab7c62e50353134c796e7a6155402a64bcff66b6a5e0"
dependencies = [ dependencies = [
"dissimilar", "dissimilar",
"once_cell", "once_cell",
@ -45,15 +39,6 @@ dependencies = [
"rowan", "rowan",
] ]
[[package]]
name = "memoffset"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
dependencies = [
"autocfg",
]
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.19.0" version = "1.19.0"
@ -71,13 +56,12 @@ dependencies = [
[[package]] [[package]]
name = "rowan" name = "rowan"
version = "0.15.15" version = "0.15.16"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49" checksum = "0a542b0253fa46e632d27a1dc5cf7b930de4df8659dc6e720b647fc72147ae3d"
dependencies = [ dependencies = [
"countme", "countme",
"hashbrown", "hashbrown",
"memoffset",
"rustc-hash", "rustc-hash",
"text-size", "text-size",
] ]

2
src/lix-doc/Cargo.toml
View file

@ -11,7 +11,7 @@ repository = "https://github.com/lf-/nix-doc"
[dependencies] [dependencies]
rnix = "0.11.0" rnix = "0.11.0"
# Necessary because rnix fails to export a critical trait (Rowan's AstNode). # Necessary because rnix fails to export a critical trait (Rowan's AstNode).
rowan = "0.15.0" rowan = "0.15.16"
[dev-dependencies] [dev-dependencies]
expect-test = "1.1.0" expect-test = "1.1.0"

4
src/lix-doc/meson.build
View file

@ -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 # FIXME: remove hack once we get rid of meson 1.4
rnix_name = 'rnix-0.11-rs' rnix_name = 'rnix-0.11-rs'
rowan_name = 'rowan-0.15-rs' rowan_name = 'rowan-0.15-rs'
@ -8,8 +6,6 @@ if meson.version().version_compare('< 1.5')
rowan_name = 'rowan-rs' rowan_name = 'rowan-rs'
endif endif
subproject(rowan_name, default_options : ['werror=false'])
rnix = dependency(rnix_name) rnix = dependency(rnix_name)
rowan = dependency(rowan_name) rowan = dependency(rowan_name)

8
subprojects/dissimilar-rs.wrap
View file

@ -1,6 +1,6 @@
[wrap-file] [wrap-file]
method = cargo method = cargo
directory = dissimilar-1.0.7 directory = dissimilar-1.0.9
source_url = https://crates.io/api/v1/crates/dissimilar/1.0.7/download source_url = https://crates.io/api/v1/crates/dissimilar/1.0.9/download
source_filename = dissimilar-1.0.7.tar.gz source_filename = dissimilar-1.0.9.tar.gz
source_hash = 86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632 source_hash = 59f8e79d1fbf76bdfbde321e902714bf6c49df88a7dda6fc682fc2979226962d

8
subprojects/expect-test-rs.wrap
View file

@ -1,6 +1,6 @@
[wrap-file] [wrap-file]
method = cargo method = cargo
directory = expect-test-1.4.1 directory = expect-test-1.5.0
source_url = https://crates.io/api/v1/crates/expect-test/1.4.1/download source_url = https://crates.io/api/v1/crates/expect-test/1.5.0/download
source_filename = expect-test-1.4.1.tar.gz source_filename = expect-test-1.5.0.tar.gz
source_hash = 30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3 source_hash = 9e0be0a561335815e06dab7c62e50353134c796e7a6155402a64bcff66b6a5e0

8
subprojects/rowan-rs.wrap
View file

@ -1,6 +1,6 @@
[wrap-file] [wrap-file]
method = cargo method = cargo
directory = rowan-0.15.15 directory = rowan-0.15.16
source_url = https://crates.io/api/v1/crates/rowan/0.15.15/download source_url = https://crates.io/api/v1/crates/rowan/0.15.16/download
source_filename = rowan-0.15.15.tar.gz source_filename = rowan-0.15.16.tar.gz
source_hash = 32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49 source_hash = 0a542b0253fa46e632d27a1dc5cf7b930de4df8659dc6e720b647fc72147ae3d