diff --git a/CHANGELOG.md b/CHANGELOG.md index fff9255..b66aba2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ ## Unreleased +- *Breaking:* The feature `defmt-03` has been renamed `defmt-10` to avoid a future breaking change. + ## 5.0.0 31-07-25 - Added `Key` implementation for the unit type `()` for easy storage of a single value diff --git a/Cargo.toml b/Cargo.toml index adc7313..53be9b1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ rust-version = "1.87" [dependencies] embedded-storage-async = "0.4.1" -defmt = { version = "0.3", optional = true } +defmt = { version = "1.0.1", optional = true } futures = { version = "0.3.30", features = ["executor"], optional = true } approx = { version = "0.5.1", optional = true } arrayvec = { version = "0.7.4", default-features = false, optional = true } @@ -26,7 +26,7 @@ futures = { version = "0.3.30", features = ["executor"] } futures-test = "0.3.30" [features] -defmt-03 = ["dep:defmt"] +defmt-10 = ["dep:defmt"] std = [] # Enable the implementation of the map Key trait for ArrayVec and ArrayString arrayvec = ["dep:arrayvec"] diff --git a/example/Cargo.lock b/example/Cargo.lock index fb72a59..93c1eed 100644 --- a/example/Cargo.lock +++ b/example/Cargo.lock @@ -4,9 +4,9 @@ version = 4 [[package]] name = "autocfg" -version = "1.2.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "az" @@ -37,15 +37,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "6a65b545ab31d687cff52899d4890855fec459eb6afe0da6417b8a18da87aa29" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677" [[package]] name = "byteorder" @@ -55,9 +55,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" [[package]] name = "cortex-m" @@ -74,41 +74,41 @@ dependencies = [ [[package]] name = "cortex-m-rt" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee84e813d593101b1723e13ec38b6ab6abbdbaaa4546553f5395ed274079ddb1" +checksum = "801d4dec46b34c299ccf6b036717ae0fce602faa4f4fe816d9013b9a7c9f5ba6" dependencies = [ "cortex-m-rt-macros", ] [[package]] name = "cortex-m-rt-macros" -version = "0.7.0" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f6f3e36f203cfedbc78b357fb28730aa2c6dc1ab060ee5c2405e843988d3c7" +checksum = "e37549a379a9e0e6e576fd208ee60394ccb8be963889eebba3ffe0980364f472" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "critical-section" -version = "1.1.2" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" +checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" [[package]] name = "crunchy" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "darling" -version = "0.20.8" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ "darling_core", "darling_macro", @@ -116,34 +116,43 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.58", + "syn", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core", "quote", - "syn 2.0.58", + "syn", +] + +[[package]] +name = "defmt" +version = "0.3.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0963443817029b2024136fc4dd07a5107eb8f977eaf18fcd1fdeb11306b64ad" +dependencies = [ + "defmt 1.0.1", ] [[package]] name = "defmt" -version = "0.3.6" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3939552907426de152b3c2c6f51ed53f98f448babd26f28694c95f5906194595" +checksum = "548d977b6da32fa1d1fda2876453da1e7df63ad0304c8b3dae4dbe7b96f39b78" dependencies = [ "bitflags 1.3.2", "defmt-macros", @@ -151,41 +160,41 @@ dependencies = [ [[package]] name = "defmt-macros" -version = "0.3.7" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18bdc7a7b92ac413e19e95240e75d3a73a8d8e78aa24a594c22cbb4d44b4bbda" +checksum = "3d4fc12a85bcf441cfe44344c4b72d58493178ce635338a3f3b78943aceb258e" dependencies = [ "defmt-parser", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.58", + "syn", ] [[package]] name = "defmt-parser" -version = "0.3.4" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4a5fefe330e8d7f31b16a318f9ce81000d8e35e69b93eae154d16d2278f70f" +checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e" dependencies = [ "thiserror", ] [[package]] name = "defmt-rtt" -version = "0.4.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "609923761264dd99ed9c7d209718cda4631c5fe84668e0f0960124cbb844c49f" +checksum = "b2cac3b8a5644a9e02b75085ebad3b6deafdbdbdec04bb25086523828aa4dfd1" dependencies = [ "critical-section", - "defmt", + "defmt 1.0.1", ] [[package]] name = "document-features" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" +checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d" dependencies = [ "litrs", ] @@ -195,7 +204,7 @@ name = "embassy-embedded-hal" version = "0.1.0" source = "git+https://github.com/embassy-rs/embassy.git?rev=029636e#029636e6fc06b484898c5935957b33b60a9c88b2" dependencies = [ - "defmt", + "defmt 0.3.100", "embassy-futures", "embassy-sync", "embassy-time", @@ -214,7 +223,7 @@ source = "git+https://github.com/embassy-rs/embassy.git?rev=029636e#029636e6fc06 dependencies = [ "cortex-m", "critical-section", - "defmt", + "defmt 0.3.100", "document-features", "embassy-executor-macros", ] @@ -227,7 +236,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.58", + "syn", ] [[package]] @@ -242,7 +251,7 @@ source = "git+https://github.com/embassy-rs/embassy.git?rev=029636e#029636e6fc06 dependencies = [ "cortex-m", "critical-section", - "defmt", + "defmt 0.3.100", "num-traits", ] @@ -251,12 +260,12 @@ name = "embassy-nrf" version = "0.1.0" source = "git+https://github.com/embassy-rs/embassy.git?rev=029636e#029636e6fc06b484898c5935957b33b60a9c88b2" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.9.2", "cfg-if", "cortex-m", "cortex-m-rt", "critical-section", - "defmt", + "defmt 0.3.100", "document-features", "embassy-embedded-hal", "embassy-hal-internal", @@ -291,7 +300,7 @@ source = "git+https://github.com/embassy-rs/embassy.git?rev=029636e#029636e6fc06 dependencies = [ "cfg-if", "critical-section", - "defmt", + "defmt 0.3.100", "embedded-io-async", "futures-util", "heapless", @@ -332,7 +341,7 @@ name = "embassy-usb-driver" version = "0.1.0" source = "git+https://github.com/embassy-rs/embassy.git?rev=029636e#029636e6fc06b484898c5935957b33b60a9c88b2" dependencies = [ - "defmt", + "defmt 0.3.100", ] [[package]] @@ -396,7 +405,7 @@ version = "0.1.0" dependencies = [ "cortex-m", "cortex-m-rt", - "defmt", + "defmt 1.0.1", "defmt-rtt", "embassy-embedded-hal", "embassy-executor", @@ -409,9 +418,9 @@ dependencies = [ [[package]] name = "fixed" -version = "1.27.0" +version = "1.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc715d38bea7b5bf487fcd79bcf8c209f0b58014f3018a7a19c2b855f472048" +checksum = "707070ccf8c4173548210893a0186e29c266901b71ed20cd9e2ca0193dfe95c3" dependencies = [ "az", "bytemuck", @@ -427,21 +436,21 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-core", "futures-task", @@ -451,9 +460,9 @@ dependencies = [ [[package]] name = "half" -version = "2.4.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" dependencies = [ "cfg-if", "crunchy", @@ -486,9 +495,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "litrs" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" +checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed" [[package]] name = "nb" @@ -628,28 +637,28 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] [[package]] name = "panic-probe" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa6fa5645ef5a760cd340eaa92af9c1ce131c8c09e7f8926d8a24b59d26652b9" +checksum = "4047d9235d1423d66cc97da7d07eddb54d4f154d6c13805c6d0793956f4f25b0" dependencies = [ "cortex-m", - "defmt", + "defmt 0.3.100", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -658,43 +667,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "proc-macro-error" -version = "1.0.4" +name = "proc-macro-error-attr2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" dependencies = [ - "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.109", - "version_check", ] [[package]] -name = "proc-macro-error-attr" -version = "1.0.4" +name = "proc-macro-error2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" dependencies = [ + "proc-macro-error-attr2", "proc-macro2", "quote", - "version_check", + "syn", ] [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] @@ -733,7 +740,7 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" name = "sequential-storage" version = "5.0.0" dependencies = [ - "defmt", + "defmt 1.0.1", "embedded-storage-async", ] @@ -745,26 +752,15 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "1.0.109" +version = "2.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" dependencies = [ "proc-macro2", "quote", @@ -773,35 +769,35 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "80d76d3f064b981389ecb4b6b7f45a0bf9fdac1d5b9204c7bd6714fecc302850" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "44d29feb33e986b6ea906bd9c3559a856983f92371b3eaa5e83782a351623de0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn", ] [[package]] name = "typenum" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "vcell" @@ -809,12 +805,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002" -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - [[package]] name = "void" version = "1.0.2" diff --git a/example/Cargo.toml b/example/Cargo.toml index 36b1cf3..69c1452 100644 --- a/example/Cargo.toml +++ b/example/Cargo.toml @@ -8,8 +8,8 @@ embassy-executor = { git = "https://github.com/embassy-rs/embassy.git", rev = "0 embassy-nrf = { git = "https://github.com/embassy-rs/embassy.git", rev = "029636e", features = ["defmt", "nrf52840"] } embassy-embedded-hal = { git = "https://github.com/embassy-rs/embassy.git", rev = "029636e", default-features = false } -defmt = "0.3" -defmt-rtt = "0.4" +defmt = "1.0.1" +defmt-rtt = "1.0.0" cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } cortex-m-rt = "0.7.0" @@ -17,7 +17,7 @@ panic-probe = { version = "0.3", features = ["print-defmt"] } embedded-storage = "0.3.1" embedded-storage-async = "0.4.1" -sequential-storage = { path = "../", features = ["defmt-03"] } +sequential-storage = { path = "../", features = ["defmt-10"] } [profile.release] lto = true diff --git a/src/cache/key_pointers.rs b/src/cache/key_pointers.rs index 19d6938..59bd919 100644 --- a/src/cache/key_pointers.rs +++ b/src/cache/key_pointers.rs @@ -12,7 +12,7 @@ pub(crate) trait KeyPointersCache { } #[derive(Debug)] -#[cfg_attr(feature = "defmt-03", derive(defmt::Format))] +#[cfg_attr(feature = "defmt-10", derive(defmt::Format))] pub(crate) struct CachedKeyPointers { key_pointers: [Option<(KEY, NonZeroU32)>; KEYS], } @@ -74,7 +74,7 @@ impl KeyPointersCache for CachedKeyPointers KeyPointersCache for UncachedKeyPointers { diff --git a/src/cache/mod.rs b/src/cache/mod.rs index 25f4fa1..2ef672b 100644 --- a/src/cache/mod.rs +++ b/src/cache/mod.rs @@ -164,7 +164,7 @@ impl> PrivateKeyCacheImpl for &mut T } #[derive(Debug)] -#[cfg_attr(feature = "defmt-03", derive(defmt::Format))] +#[cfg_attr(feature = "defmt-10", derive(defmt::Format))] pub(crate) struct DirtTracker { /// Managed from the library code. /// @@ -199,7 +199,7 @@ impl DirtTracker { /// This type of cache doesn't have to be kept around and may be constructed on every api call. /// You could simply pass `&mut NoCache::new()` every time. #[derive(Debug)] -#[cfg_attr(feature = "defmt-03", derive(defmt::Format))] +#[cfg_attr(feature = "defmt-10", derive(defmt::Format))] pub struct NoCache { page_states: UncachedPageStates, page_pointers: UncachedPagePointers, @@ -268,7 +268,7 @@ impl PrivateKeyCacheImpl for NoCache { /// /// Make sure the page count is correct. If the number is lower than the actual amount, the code will panic at some point. #[derive(Debug)] -#[cfg_attr(feature = "defmt-03", derive(defmt::Format))] +#[cfg_attr(feature = "defmt-10", derive(defmt::Format))] pub struct PageStateCache { dirt_tracker: DirtTracker, page_states: CachedPageStates, @@ -342,7 +342,7 @@ impl PrivateKeyCacheImpl for PageStateCa /// /// Make sure the page count is correct. If the number is lower than the actual amount, the code will panic at some point. #[derive(Debug)] -#[cfg_attr(feature = "defmt-03", derive(defmt::Format))] +#[cfg_attr(feature = "defmt-10", derive(defmt::Format))] pub struct PagePointerCache { dirt_tracker: DirtTracker, page_states: CachedPageStates, @@ -421,7 +421,7 @@ impl PrivateKeyCacheImpl for PagePointer /// the chance of a cache hit. /// The keys are cached in a fifo and any time its location is updated in cache it's added to the front. #[derive(Debug)] -#[cfg_attr(feature = "defmt-03", derive(defmt::Format))] +#[cfg_attr(feature = "defmt-10", derive(defmt::Format))] pub struct KeyPointerCache { dirt_tracker: DirtTracker, page_states: CachedPageStates, diff --git a/src/cache/page_pointers.rs b/src/cache/page_pointers.rs index 5549766..95a363e 100644 --- a/src/cache/page_pointers.rs +++ b/src/cache/page_pointers.rs @@ -29,7 +29,7 @@ pub(crate) trait PagePointersCache: Debug { // Use NoneZeroU32 because we never store 0's in here (because of the first page marker) // and so Option can make use of the niche so we save bytes -#[cfg_attr(feature = "defmt-03", derive(defmt::Format))] +#[cfg_attr(feature = "defmt-10", derive(defmt::Format))] pub(crate) struct CachedPagePointers { after_erased_pointers: [Option; PAGE_COUNT], after_written_pointers: [Option; PAGE_COUNT], @@ -139,7 +139,7 @@ impl PagePointersCache for CachedPagePointers { pages: [Option; PAGE_COUNT], } @@ -56,7 +56,7 @@ impl PageStatesCache for CachedPageStates { } #[derive(Debug, Default)] -#[cfg_attr(feature = "defmt-03", derive(defmt::Format))] +#[cfg_attr(feature = "defmt-10", derive(defmt::Format))] pub(crate) struct UncachedPageStates; impl PageStatesCache for UncachedPageStates { diff --git a/src/lib.rs b/src/lib.rs index 1af54da..6b0d8ad 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -336,7 +336,7 @@ async fn partial_close_page( /// The state of a page #[derive(Debug, Clone, Copy, PartialEq, Eq)] -#[cfg_attr(feature = "defmt-03", derive(defmt::Format))] +#[cfg_attr(feature = "defmt-10", derive(defmt::Format))] enum PageState { /// This page was fully written and has now been sealed Closed, @@ -376,7 +376,7 @@ impl PageState { /// The main error type #[non_exhaustive] #[derive(Debug)] -#[cfg_attr(feature = "defmt-03", derive(defmt::Format))] +#[cfg_attr(feature = "defmt-10", derive(defmt::Format))] pub enum Error { /// An error in the storage (flash) Storage { diff --git a/src/map.rs b/src/map.rs index 05de294..1fb763e 100644 --- a/src/map.rs +++ b/src/map.rs @@ -1173,7 +1173,7 @@ impl_map_item_num!(f64); /// This error type is predefined (in contrast to using generics) to save many kilobytes of binary size. #[non_exhaustive] #[derive(Debug, PartialEq, Eq, Clone)] -#[cfg_attr(feature = "defmt-03", derive(defmt::Format))] +#[cfg_attr(feature = "defmt-10", derive(defmt::Format))] pub enum SerializationError { /// The provided buffer was too small. BufferTooSmall,