Commit 07d00c7e authored by Ian Jackson's avatar Ian Jackson 💬
Browse files

Merge branch 'updates' into 'main' 

Prepare for 0.4.0 release

See merge request Diziet/rust-derive-adhoc!115
parents b116cf57 508db0ce

.gitlab-ci.yml

+1 −2
Original line number Diff line number Diff line
@@ -82,8 +82,7 @@ every-commit: 
  image: rustlang/rust@sha256:415b7c22ab4a8a3ec3efc9cc8d7b018964f0c6757fff27bbd110e0ed92566321

  script:

    - ./maint/via-cargo-install-in-ci cargo-expand --locked --version=1.0.44 --features=prettyplease

    - mv Cargo.lock.example Cargo.lock

    - maint/for-every-commit cargo test --locked --workspace --verbose --all-features

    - maint/for-every-commit sh -ec 'cp Cargo.lock.example Cargo.lock && cargo test --locked --workspace --verbose --all-features'

  cache:

    when: 'always'

    paths:

CHANGELOG.md

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ We expect to increase it cautiously and only with good reason. 


## Changelog



### UNRELEASED

### 0.4.0



#### Breaking

Cargo.lock.example

+35 −35
Original line number Diff line number Diff line
@@ -81,9 +81,9 @@ dependencies = [ 


[[package]]

name = "derive-adhoc"

version = "0.3.0"

version = "0.4.0"

dependencies = [

 "derive-adhoc-macros 0.3.0",

 "derive-adhoc-macros 0.4.0",

 "heck",

]
@@ -105,7 +105,7 @@ dependencies = [ 


[[package]]

name = "derive-adhoc-macros"

version = "0.3.0"

version = "0.4.0"

dependencies = [

 "heck",

 "itertools",
@@ -122,14 +122,14 @@ dependencies = [ 
name = "derive-adhoc-stderr-test"

version = "0.0.1"

dependencies = [

 "derive-adhoc 0.3.0",

 "derive-adhoc 0.4.0",

]



[[package]]

name = "derive-adhoc-tests"

version = "0.0.1"

dependencies = [

 "derive-adhoc 0.3.0",

 "derive-adhoc 0.4.0",

 "easy-ext",

 "glob",

 "macrotest",
@@ -144,9 +144,9 @@ checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" 


[[package]]

name = "digest"

version = "0.10.6"

version = "0.10.7"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"

checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"

dependencies = [

 "block-buffer",

 "crypto-common",
@@ -219,18 +219,18 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" 


[[package]]

name = "keccak"

version = "0.1.3"

version = "0.1.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768"

checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"

dependencies = [

 "cpufeatures",

]



[[package]]

name = "libc"

version = "0.2.142"

version = "0.2.145"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"

checksum = "fc86cde3ff845662b8f4ef6cb50ea0e20c524eb3d29ae048287e06a1b3fa6a81"



[[package]]

name = "macrotest"
@@ -278,9 +278,9 @@ dependencies = [ 


[[package]]

name = "once_cell"

version = "1.17.1"

version = "1.18.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"

checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"



[[package]]

name = "prettyplease"
@@ -304,9 +304,9 @@ dependencies = [ 


[[package]]

name = "proc-macro2"

version = "1.0.56"

version = "1.0.59"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"

checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"

dependencies = [

 "unicode-ident",

]
@@ -315,7 +315,7 @@ dependencies = [ 
name = "pub-a"

version = "0.0.1"

dependencies = [

 "derive-adhoc 0.3.0",

 "derive-adhoc 0.4.0",

]



[[package]]
@@ -328,9 +328,9 @@ dependencies = [ 


[[package]]

name = "quote"

version = "1.0.26"

version = "1.0.28"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"

checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"

dependencies = [

 "proc-macro2",

]
@@ -349,22 +349,22 @@ checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" 


[[package]]

name = "serde"

version = "1.0.160"

version = "1.0.163"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"

checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"

dependencies = [

 "serde_derive",

]



[[package]]

name = "serde_derive"

version = "1.0.160"

version = "1.0.163"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"

checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"

dependencies = [

 "proc-macro2",

 "quote",

 "syn 2.0.15",

 "syn 2.0.18",

]



[[package]]
@@ -380,9 +380,9 @@ dependencies = [ 


[[package]]

name = "sha3"

version = "0.10.7"

version = "0.10.8"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "54c2bb1a323307527314a36bfb73f24febb08ce2b8a554bf4ffd6f51ad15198c"

checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"

dependencies = [

 "digest",

 "keccak",
@@ -423,9 +423,9 @@ dependencies = [ 


[[package]]

name = "syn"

version = "2.0.15"

version = "2.0.18"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"

checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"

dependencies = [

 "proc-macro2",

 "quote",
@@ -452,15 +452,15 @@ dependencies = [ 


[[package]]

name = "toml_datetime"

version = "0.6.1"

version = "0.6.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"

checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"



[[package]]

name = "toml_edit"

version = "0.19.8"

version = "0.19.10"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"

checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"

dependencies = [

 "indexmap",

 "toml_datetime",
@@ -490,9 +490,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" 


[[package]]

name = "unicode-ident"

version = "1.0.8"

version = "1.0.9"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"

checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"



[[package]]

name = "version_check"
@@ -539,9 +539,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" 


[[package]]

name = "winnow"

version = "0.4.1"

version = "0.4.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"

checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"

dependencies = [

 "memchr",

]

Cargo.lock.minimal

+6 −6
Original line number Diff line number Diff line
@@ -56,9 +56,9 @@ dependencies = [ 


[[package]]

name = "derive-adhoc"

version = "0.3.0"

version = "0.4.0"

dependencies = [

 "derive-adhoc-macros 0.3.0",

 "derive-adhoc-macros 0.4.0",

 "heck",

]
@@ -80,7 +80,7 @@ dependencies = [ 


[[package]]

name = "derive-adhoc-macros"

version = "0.3.0"

version = "0.4.0"

dependencies = [

 "heck",

 "itertools",
@@ -97,14 +97,14 @@ dependencies = [ 
name = "derive-adhoc-stderr-test"

version = "0.0.1"

dependencies = [

 "derive-adhoc 0.3.0",

 "derive-adhoc 0.4.0",

]



[[package]]

name = "derive-adhoc-tests"

version = "0.0.1"

dependencies = [

 "derive-adhoc 0.3.0",

 "derive-adhoc 0.4.0",

 "easy-ext",

 "glob",

 "macrotest",
@@ -259,7 +259,7 @@ dependencies = [ 
name = "pub-a"

version = "0.0.1"

dependencies = [

 "derive-adhoc 0.3.0",

 "derive-adhoc 0.4.0",

]



[[package]]

Cargo.toml

+2 −2
Original line number Diff line number Diff line 
[package]

name = "derive-adhoc"

version = "0.3.0"

version = "0.4.0"

edition = "2018"

license="MIT"

authors=["Ian Jackson <ijackson@chiark.greenend.org.uk>",
@@ -42,6 +42,6 @@ case = ["derive-adhoc-macros/case", "heck"] 
expect = ["derive-adhoc-macros/expect"]



[dependencies]

derive-adhoc-macros = { path = "macros", version = "=0.3.0", default_features = false }

derive-adhoc-macros = { path = "macros", version = "=0.4.0", default_features = false }

# This dependency is *here* only for the link to `heck` in the docs.

heck = { version = "0.4", optional = true }