vincenzopalazzo
/
arti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Cargo.lock for d-a versions 

!1410 and !1412 had a semantic conflict *in the Cargo lockfile*!

!1410 added a new indirect dependency on derive-adhoc, which is used
in pwd-grp.  pwd-grp is still declaring a dependency on d-a 0.6.1.
(This ought to be updated there in due course, but isn't a bug.)

!1412 updated our direct dependency on derive-adhoc to require 0.7.x.
In fact, the breaking change 0.6.x to 0.7.x is minor and we could have
written a more relaxed dependency.But cargo's syntax for that is very
clumsy - here is an example from derive-adhoc iteself:
  itertools = ">=0.10.1, <0.12"

Fix this for now in our tree with a `cargo update`, to unbreak main.
This commit is contained in:
Ian Jackson 2023-07-18 11:13:56 +01:00
parent bd21ea34c2
commit 46492d8af2
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Cargo.lock generated
View File

@ -1081,16 +1081,43 @@ dependencies = [
"zeroize",
]
[[package]]
name = "derive-adhoc"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3bf4f1be2a84b4ba6f6443854fc9c3b8942ee3ffadadc7106fa777659a946cd4"
dependencies = [
"derive-adhoc-macros 0.6.1",
"heck",
]
[[package]]
name = "derive-adhoc"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f67099c8db34a9fde66880bfccd24d6e401c0f643a04684dce963e97a25fd621"
dependencies = [
"derive-adhoc-macros",
"derive-adhoc-macros 0.7.0",
"heck",
]
[[package]]
name = "derive-adhoc-macros"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a7134a81d247901c0d03ef80194867644796cd8f858e82bf1b433dfc1c35485"
dependencies = [
"heck",
"itertools",
"proc-macro-crate",
"proc-macro2",
"quote",
"sha3",
"strum",
"syn 1.0.109",
"void",
]
[[package]]
name = "derive-adhoc-macros"
version = "0.7.0"
@ -2852,7 +2879,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f051bd6fedf71a440d884906dd1c9b66c678e3a2882652b53c5ec8b0aa4268e4"
dependencies = [
"derive-adhoc",
"derive-adhoc 0.6.1",
"libc",
"paste",
"thiserror",
@ -4863,7 +4890,7 @@ version = "0.8.2"
dependencies = [
"amplify",
"async-trait",
"derive-adhoc",
"derive-adhoc 0.7.0",
"educe",
"futures",
"futures-await-test",