From 374e50a90cd05ed9c6f03fbb769977400e238736 Mon Sep 17 00:00:00 2001 From: Yuri Astrakhan Date: Sat, 9 Mar 2024 00:40:58 -0500 Subject: [PATCH] fix dup test name --- Cargo.lock | 277 +++++++++++---------- martin/src/pg/tls.rs | 7 +- mbtiles/tests/copy.rs | 40 +-- tests/expected/configured/spr_cmp.png | Bin 787 -> 785 bytes tests/expected/configured/spr_cmp_2x.png | Bin 1569 -> 1567 bytes tests/expected/configured/spr_mysrc.png | Bin 191 -> 189 bytes tests/expected/configured/spr_mysrc_2x.png | Bin 344 -> 344 bytes tests/expected/configured/spr_src1.png | Bin 758 -> 758 bytes 8 files changed, 174 insertions(+), 150 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6d0974dfa..0744241fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -80,7 +80,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -194,7 +194,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -214,9 +214,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d713b3834d76b85304d4d525563c1276e2e30dc97cc67bfb4585a4a29fc2c89f" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom", @@ -278,9 +278,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.12" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -384,7 +384,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -406,7 +406,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -417,7 +417,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -431,11 +431,11 @@ dependencies = [ [[package]] name = "atomic-write-file" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edcdbedc2236483ab103a53415653d6b4442ea6141baf1ffa85df29635e88436" +checksum = "a8204db279bf648d64fe845bd8840f78b39c8132ed4d6a4194c3b10d4b4cfb0b" dependencies = [ - "nix 0.27.1", + "nix 0.28.0", "rand", ] @@ -562,9 +562,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.3" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytecount" @@ -644,10 +644,11 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.88" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" dependencies = [ + "jobserver", "libc", ] @@ -657,17 +658,23 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.52.3", + "windows-targets 0.52.4", ] [[package]] @@ -728,7 +735,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -891,9 +898,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ "crossbeam-utils", ] @@ -961,7 +968,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" dependencies = [ "quote", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -985,7 +992,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -996,7 +1003,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -1158,7 +1165,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -1478,7 +1485,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -1581,7 +1588,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.2.3", + "indexmap 2.2.5", "slab", "tokio", "tokio-util", @@ -1634,9 +1641,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379dada1584ad501b383485dd706b8afb7a70fcbc7f4da7d780638a5a6124a60" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1679,9 +1686,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1813,9 +1820,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.3" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -1836,7 +1843,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "321f0f839cd44a4686e9504b0a62b4d69a50b62072144c71c68f5873c167b8d9" dependencies = [ "ahash", - "indexmap 2.2.3", + "indexmap 2.2.5", "is-terminal", "itoa", "log", @@ -1849,9 +1856,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.35.1" +version = "1.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c985c1bef99cf13c58fade470483d81a2bfe846ebde60ed28cc2dddec2df9e2" +checksum = "0a7c22c4d34ef4788c351e971c52bfdfe7ea2766f8c5466bc175dd46e52ac22e" dependencies = [ "console", "lazy_static", @@ -1903,6 +1910,15 @@ version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +[[package]] +name = "jobserver" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +dependencies = [ + "libc", +] + [[package]] name = "jpeg-decoder" version = "0.3.1" @@ -1911,9 +1927,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -2011,19 +2027,18 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libdeflate-sys" -version = "1.19.2" +version = "1.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7654050a14083995afdf189c4d895b59bc6c8195407c24db4df4c3878b3679d" +checksum = "cc9caa76c8cc6ee8c4efcf8f4514a812ebcad3aa7d3b548efe4d26da1203f177" dependencies = [ "cc", - "pkg-config", ] [[package]] name = "libdeflater" -version = "1.19.2" +version = "1.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ae43f79441cf19e744fba2aa762e4b6a9016970137e67d3a45eec96ed11bb27" +checksum = "265a985bd31e5f22e2b2ac107cbed44c6ccf40ae236e46963cd00dd213e4bd03" dependencies = [ "libdeflate-sys", ] @@ -2304,12 +2319,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.4.2", "cfg-if", + "cfg_aliases", "libc", ] @@ -2466,7 +2482,7 @@ dependencies = [ "bitvec", "crossbeam-channel", "filetime", - "indexmap 2.2.3", + "indexmap 2.2.5", "libdeflater", "log", "rayon", @@ -2522,7 +2538,7 @@ dependencies = [ "regex", "regex-syntax 0.7.5", "structmeta", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -2598,22 +2614,22 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -3020,9 +3036,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" dependencies = [ "either", "rayon-core", @@ -3067,9 +3083,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -3096,9 +3112,9 @@ checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" [[package]] name = "reqwest" -version = "0.11.24" +version = "0.11.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +checksum = "0eea5a9eb898d3783f17c6407670e3592fd174cb81a10e51d4c37f49450b9946" dependencies = [ "base64 0.21.7", "bytes", @@ -3236,7 +3252,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.51", + "syn 2.0.52", "unicode-ident", ] @@ -3500,7 +3516,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -3557,7 +3573,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.3", + "indexmap 2.2.5", "serde", "serde_derive", "serde_json", @@ -3574,7 +3590,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -3583,7 +3599,7 @@ version = "0.9.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f" dependencies = [ - "indexmap 2.2.3", + "indexmap 2.2.5", "itoa", "ryu", "serde", @@ -3817,7 +3833,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.2.3", + "indexmap 2.2.5", "log", "memchr", "once_cell", @@ -4031,7 +4047,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -4042,7 +4058,7 @@ checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -4109,9 +4125,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.51" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab617d94515e94ae53b8406c628598680aa0c9587474ecbe58188f7b345d66c" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -4126,20 +4142,20 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", @@ -4159,9 +4175,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.10.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", @@ -4186,7 +4202,7 @@ checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -4310,7 +4326,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -4456,7 +4472,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -4710,9 +4726,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -4733,11 +4749,17 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4745,24 +4767,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.52", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -4772,9 +4794,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4782,28 +4804,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.52", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -4829,11 +4851,12 @@ dependencies = [ [[package]] name = "whoami" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +checksum = "0fec781d48b41f8163426ed18e8fc2864c12937df9ce54c88ede7bd47270893e" dependencies = [ - "wasm-bindgen", + "redox_syscall", + "wasite", "web-sys", ] @@ -4874,7 +4897,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.3", + "windows-targets 0.52.4", ] [[package]] @@ -4892,7 +4915,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.3", + "windows-targets 0.52.4", ] [[package]] @@ -4912,17 +4935,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.3", - "windows_aarch64_msvc 0.52.3", - "windows_i686_gnu 0.52.3", - "windows_i686_msvc 0.52.3", - "windows_x86_64_gnu 0.52.3", - "windows_x86_64_gnullvm 0.52.3", - "windows_x86_64_msvc 0.52.3", + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -4933,9 +4956,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -4945,9 +4968,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -4957,9 +4980,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -4969,9 +4992,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -4981,9 +5004,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -4993,9 +5016,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -5005,9 +5028,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winreg" @@ -5091,7 +5114,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] @@ -5111,7 +5134,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.52", ] [[package]] diff --git a/martin/src/pg/tls.rs b/martin/src/pg/tls.rs index 3b0297a02..9f28fc664 100644 --- a/martin/src/pg/tls.rs +++ b/martin/src/pg/tls.rs @@ -9,6 +9,7 @@ use deadpool_postgres::tokio_postgres::Config; use log::{info, warn}; use regex::Regex; use rustls::client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier}; +use rustls::crypto::ring::default_provider; use rustls::crypto::{verify_tls12_signature, verify_tls13_signature}; use rustls::pki_types::{CertificateDer, ServerName, UnixTime}; use rustls::{DigitallySignedStruct, Error, SignatureScheme}; @@ -80,7 +81,7 @@ impl ServerCertVerifier for NoCertificateVerification { message, cert, dss, - &rustls::crypto::ring::default_provider().signature_verification_algorithms, + &default_provider().signature_verification_algorithms, ) } @@ -94,12 +95,12 @@ impl ServerCertVerifier for NoCertificateVerification { message, cert, dss, - &rustls::crypto::ring::default_provider().signature_verification_algorithms, + &default_provider().signature_verification_algorithms, ) } fn supported_verify_schemes(&self) -> Vec { - rustls::crypto::ring::default_provider() + default_provider() .signature_verification_algorithms .supported_schemes() } diff --git a/mbtiles/tests/copy.rs b/mbtiles/tests/copy.rs index 3f3318524..345abb2a2 100644 --- a/mbtiles/tests/copy.rs +++ b/mbtiles/tests/copy.rs @@ -3,7 +3,7 @@ use std::path::PathBuf; use std::str::from_utf8; use ctor::ctor; -use insta::{allow_duplicates, assert_display_snapshot}; +use insta::{allow_duplicates, assert_snapshot}; use itertools::Itertools as _; use log::info; use martin_tile_utils::xyz_to_bbox; @@ -145,7 +145,7 @@ macro_rules! new_file { }}; } -macro_rules! assert_snapshot { +macro_rules! assert_dump { ($actual_value:expr, $($arg:tt)*) => {{ let mut settings = insta::Settings::clone_current(); settings.set_snapshot_suffix(format!($($arg)*)); @@ -191,7 +191,7 @@ fn databases() -> Databases { let (raw_empty_mbt, mut raw_empty_cn) = new_file_no_hash!(databases, mbt_typ, "", "", "{typ}__empty-no-hash"); let dmp = dump(&mut raw_empty_cn).await.unwrap(); - assert_snapshot!(&dmp, "{typ}__empty-no-hash"); + assert_dump!(&dmp, "{typ}__empty-no-hash"); result.add("empty_no_hash", mbt_typ, dmp, raw_empty_mbt, raw_empty_cn); let (empty_mbt, mut empty_cn) = open!(databases, "{typ}__empty"); @@ -203,10 +203,10 @@ fn databases() -> Databases { }; opt.run().await.unwrap(); let dmp = dump(&mut empty_cn).await.unwrap(); - assert_snapshot!(&dmp, "{typ}__empty"); + assert_dump!(&dmp, "{typ}__empty"); let hash = empty_mbt.validate(Off, Verify).await.unwrap(); allow_duplicates! { - assert_display_snapshot!(hash, @"D41D8CD98F00B204E9800998ECF8427E"); + assert_snapshot!(hash, @"D41D8CD98F00B204E9800998ECF8427E"); } result.add("empty", mbt_typ, dmp, empty_mbt, empty_cn); @@ -218,7 +218,7 @@ fn databases() -> Databases { "{typ}__v1-no-hash" ); let dmp = dump(&mut raw_cn).await.unwrap(); - assert_snapshot!(&dmp, "{typ}__v1-no-hash"); + assert_dump!(&dmp, "{typ}__v1-no-hash"); result.add("v1_no_hash", mbt_typ, dmp, raw_mbt, raw_cn); let (v1_mbt, mut v1_cn) = open!(databases, "{typ}__v1"); @@ -230,20 +230,20 @@ fn databases() -> Databases { }; opt.run().await.unwrap(); let dmp = dump(&mut v1_cn).await.unwrap(); - assert_snapshot!(&dmp, "{typ}__v1"); + assert_dump!(&dmp, "{typ}__v1"); let hash = v1_mbt.validate(Off, Verify).await.unwrap(); allow_duplicates! { - assert_display_snapshot!(hash, @"9ED9178D7025276336C783C2B54D6258"); + assert_snapshot!(hash, @"9ED9178D7025276336C783C2B54D6258"); } result.add("v1", mbt_typ, dmp, v1_mbt, v1_cn); let (v2_mbt, mut v2_cn) = new_file!(databases, mbt_typ, METADATA_V2, TILES_V2, "{typ}__v2"); let dmp = dump(&mut v2_cn).await.unwrap(); - assert_snapshot!(&dmp, "{typ}__v2"); + assert_dump!(&dmp, "{typ}__v2"); let hash = v2_mbt.validate(Off, Verify).await.unwrap(); allow_duplicates! { - assert_display_snapshot!(hash, @"3BCDEE3F52407FF1315629298CB99133"); + assert_snapshot!(hash, @"3BCDEE3F52407FF1315629298CB99133"); } result.add("v2", mbt_typ, dmp, v2_mbt, v2_cn); @@ -258,10 +258,10 @@ fn databases() -> Databases { }; opt.run().await.unwrap(); let dmp = dump(&mut dif_cn).await.unwrap(); - assert_snapshot!(&dmp, "{typ}__dif"); + assert_dump!(&dmp, "{typ}__dif"); let hash = dif_mbt.validate(Off, Verify).await.unwrap(); allow_duplicates! { - assert_display_snapshot!(hash, @"B86122579EDCDD4C51F3910894FCC1A1"); + assert_snapshot!(hash, @"B86122579EDCDD4C51F3910894FCC1A1"); } result.add("dif", mbt_typ, dmp, dif_mbt, dif_cn); } @@ -274,7 +274,7 @@ async fn update() -> MbtResult<()> { let (mbt, mut cn) = new_file_no_hash!(databases, Flat, METADATA_V1, TILES_V1, "update"); mbt.update_metadata(&mut cn, UpdateZoomType::Reset).await?; let dmp = dump(&mut cn).await?; - assert_snapshot!(&dmp, "update"); + assert_dump!(&dmp, "update"); Ok(()) } @@ -309,7 +309,7 @@ async fn convert( }; let dmp = dump(&mut opt.run().await?).await?; allow_duplicates! { - assert_snapshot!(dmp, "v1__meta__{to}"); + assert_dump!(dmp, "v1__meta__{to}"); }; let opt = MbtilesCopier { @@ -321,7 +321,7 @@ async fn convert( }; let dmp = dump(&mut opt.run().await?).await?; allow_duplicates! { - assert_snapshot!(dmp, "v1__tiles__{to}"); + assert_dump!(dmp, "v1__tiles__{to}"); } let opt = MbtilesCopier { @@ -333,7 +333,7 @@ async fn convert( }; let z6only = dump(&mut opt.run().await?).await?; allow_duplicates! { - assert_snapshot!(z6only, "v1__z6__{to}"); + assert_dump!(z6only, "v1__z6__{to}"); } // Filter (0, 0, 2, 2) in mbtiles coordinates, which is (0, 2^5-1-2, 2, 2^5-1-0) = (0, 29, 2, 31) in XYZ coordinates, and slightly decrease it @@ -352,7 +352,7 @@ async fn convert( }; let dmp = dump(&mut opt.run().await?).await?; allow_duplicates! { - assert_snapshot!(dmp, "v1__bbox__{to}"); + assert_dump!(dmp, "v1__bbox__{to}"); } let opt = MbtilesCopier { @@ -392,7 +392,7 @@ async fn diff_and_patch( let v1_mbt = databases.mbtiles("v1", v1_type); let v2_mbt = databases.mbtiles("v2", v2_type); - let (dif_mbt, mut dif_cn) = open!(diff_and_patchdiff_and_patch, "{prefix}__dif"); + let (dif_mbt, mut dif_cn) = open!(diff_and_patch, "{prefix}__dif"); info!("TEST: Compare v1 with v2, and copy anything that's different (i.e. mathematically: v2-v1=diff)"); let mut opt = MbtilesCopier { @@ -426,7 +426,7 @@ async fn diff_and_patch( apply_patch(path(&tar1_mbt), path(&dif_mbt)).await?; let hash_v1 = tar1_mbt.validate(Off, Verify).await?; allow_duplicates! { - assert_display_snapshot!(hash_v1, @"3BCDEE3F52407FF1315629298CB99133"); + assert_snapshot!(hash_v1, @"3BCDEE3F52407FF1315629298CB99133"); } let dmp = dump(&mut tar1_cn).await?; pretty_assert_eq!(&dmp, expected_v2); @@ -437,7 +437,7 @@ async fn diff_and_patch( apply_patch(path(&tar2_mbt), path(&dif_mbt)).await?; let hash_v2 = tar2_mbt.validate(Off, Verify).await?; allow_duplicates! { - assert_display_snapshot!(hash_v2, @"3BCDEE3F52407FF1315629298CB99133"); + assert_snapshot!(hash_v2, @"3BCDEE3F52407FF1315629298CB99133"); } let dmp = dump(&mut tar2_cn).await?; pretty_assert_eq!(&dmp, expected_v2); diff --git a/tests/expected/configured/spr_cmp.png b/tests/expected/configured/spr_cmp.png index 197c70d09170009358a804c09136a9b17b727ff5..ffb3546925d2136c95e615982d07ad025b0077b1 100644 GIT binary patch delta 700 zcmV;t0z>_i29XAkBmvlwB_RQ_kw+wdA$tj;mqa`i57K%pD9?H2?XnJrWtmqJ!4E!m zXXbs$`)1zEtkw>oX`_NA!KNS(>(m!-r+agEeCWmG>D8yH0jOjWjraKr``X3g7{*|1 zIg|K~T8#r_z;KfHA;uW89!-3$K7nsbW%yJn!a~NZ7RNDU>N?!nW4i!m*=jz@u=;P370vIP|27L zoaMz^=O|%+F3(K?Y95d4tEwiFf}lvlsrzS_Pp$YG@DNvRe&ToowJIh;f@=&$ni`=n z7|CIRftZM-RaYacYC>L>hly~1Er4(TGhe zqGNKiBS$vxhn45Euxm$;YoxFDfP3>}493n3hxe-*vA8$8Q(o`#SKM2F`}5*F+)RzZ zgR7UY?Gi6eJgzxz^d#%?ODH8{A(7-4O1Ldw-#P!0^Fy)4V4|f-$eWRgrQ+m9I};xs zWqx28avCu>SA#ZuNf3~wv7_*6`V4+VBJthX8%Qjz6sMV-(nn+0fXw{!CZsa+-7^$p zXu;5;BY2J4TdyTUmUPd5*wkkP{PULl^Gezd!4gb*+DS?#q@?Wt48c0RUl&{#tO=%h zv|FEim1eI_&$6IRvzetnpg4m^%Wq- i&{OvtSJM7R7veWEY1+w8yORk30000E7HOA9^u)di7~$0BX5Z^L_EcKEGHT!x)UM z=2G8LtEm7PU{3M@#26;((ZtvK6Zp1Ng-^9IEaZ%O$>>Xzjp(srDxO5*JNDs!7{*{M zY8Ix3*HxLQa6(Al*F3=4#l(pg<+&+9&Es)>Rn|nB6C}x;x_@^0)JmWM4{_DzCyqB!D`O(Uxu(EKOCyv9 zV+Bkw6jQOR>}up?O^B=VFcocogfT%hWsS5H8Zkv91M%H(wtp{(iTCc={#P3{vPM85 zE&Qf8!5b$JAw?r-uB(keh|=nQBUta=ByW$NfSo$dQfvVdeQO?Ap=e8tLmj;NJWggRwKi(fzVUOx2s+DX(|MEAFj-{dsX7Zf3^d z!PQIHc8M1!9@i>v^t96BmrzM3B0R}2l&~*f-#P!$(Wo%fR$!v72`Cz|iKX)7x}S*; zk8(e;3{@IoDp!Lxe8t(wm9eAnYWfWRiA3VNvp0}fS{apQ3Q~U>y9Q+Dzc(S2S>T?b z7^a0on~vZ$YHz-l44J}zJ!4ZJ3;E-1@$*vJ4#DJ1I}LgV&WMz@17MsMyz;UBPOBc4=fep)WlT?r zv}im_{Z7ISIjwqt=iT;fRuG;M;Y0#Ct$NtvQaiI2G%lxA4@M;|k)(E#+IrBqlvXjs kSps_MLE}=|Ep#FN05WOX$sKl12mk;807*qoM6N<$f`JKHIsgCw diff --git a/tests/expected/configured/spr_cmp_2x.png b/tests/expected/configured/spr_cmp_2x.png index c8343819da06ff76bc66ddfd2f51609dcc7ef924..e1ce6514bfef7520f22e378a4d87aece82c7f688 100644 GIT binary patch delta 902 zcmV;119|+R44(|JcLINtNklsK2^7zXf1c1u#I#dyhLqm)u(ZEOoFB(^~$ z5|m0Y5u(-VHdw1ssiA5?2|A)v>-|!F|6q3}n-Z4n&fA;rwrJS8SHh_Rr7e!;~5CRS@HN=~zz-Ap=kZl%D#L#A5)N3zmHyXp(rx{TyGpen*)vOuIH+F4jf5c5mZXTcd?Tu10{dBN=?A*oD4N-LD^nY z>-bFUbItXvF-pc|gh?n%8(znT=wRI|*_dZ^M9S!+y1ibli;im5_3ejXkdy{`_lGZu z5Z{PP!!WQ)(x7DNIkAeAX$F~fN7!Z{PDABxphl49XDPrmXTJ;4@AOuljtU|+yeDmiy4NAERDM)m1+KjsE(2 z)m5&jvt=^CzO4ZL%U`(rh?n|cv?v)Cp$%=i`z-gvEW^CjYmdC`2E2X{X8ebi_Tanj z9&hx4WrDvDJo?JkC+@Dx*TmU=a9AtSV8w#gcSd+N>mOWpJ@3`lw>b9{{$C>9@uIk6 zOY9o$#RW&ppeM41AA3(&*@zAcy)t3AR=ts2>3FV^=qOK~0&usf)nPFi3!Tl7f-cfn zW>L0T%)~l>$2>G5W*RgwlAV*Dx$MY5=y#J41r&dli5x@Py%|aYND*D2oFVOAit@ly zL{G&^`;%iz`BFr=1Z+p0(_$P* zkjFtHN8}h%HoHuzRvE?hd^Alt{X*G}PQlfDi{8`=bhJ6g^#@{x($Oin3X}j~t4(!i zM!kO50do2S5>$vz!9}F2^rlkTpB*~i%%an~EGeo@1<~%@%%W3p6)6E3>w2Bj)%_*OqE)o^fc5pVN c_xvCI3tS4geFRkVJOBUy07*qoM6N<$f_FlsK2^7zXf1c1zMwi}Au@qm)u(ZEOoFB(|wY zBq)_)B1EgzZLn6OQbW~(5_CkT*88RU{=x1{HYF_CotK;(k01K`z~SXN$&=Zc?1J55 zk4>JNky6e~9!ntL)FshaJcNKliw*JSDX>|`=4G4t6EU=z6ZJ6K>dnS5c6q#UbG23% zbL@(e3>vr4a#~z-JvSN$(B?qnhU>W|o&(2_t_Ug(!FQ>XB?BdYx=KyJ?3@fWX+haq zRqOan>~UR{tO^*7%LtQD7T3Lwb|il%Jv^Wi?e7A^h@k(BhEZMs&`STay z+rD#Wn^#hjEHkPkgtZgZ}r+EZ@U4nAA}kIp`|_e zuDi<{ePEg3F9eUiviXU-p!J;*o{jnkS5(7$wY5$2J%#@-k>By6 zxNB4F812P>10vaE>kz6~=6H%9kpWuS}Hz zAX)Y&$CUD=h;m8Tjyk8sIFKZdgJe$qG^AX1nNqDXitG7knsWLNWji_rSMw!$Q!mod z<{Z~=h-pekr{F43QmsdAszcN2wGNQeZ;+%ybP6saU8Ogb%Kq%og=Q9=?z5y=jO*Wb z=4KXKor0@KN%)df49?N%J~n;|zC5Lab94$WyFw{wV^pz&b94$ehiK|Ba5zuo1ZPvq u=Tu0mIKkPR^4aMkQ88@?XG40=|Ixo(3b=jzso?Mc0000vDv diff --git a/tests/expected/configured/spr_mysrc.png b/tests/expected/configured/spr_mysrc.png index 076b4c2c412cc822263904304717a9fedc844536..db2640780735fc4dec9a06f6443d03133329341e 100644 GIT binary patch delta 161 zcmV;S0AByU0lfi`B!7fSL_t(|+O5$+5yCJSMBz_Dr63^=h=fY01CUY&;GlKTI3NyE z2R}0%E}d|LcYC{gTYser?R#7SLCwtBz zaWGV+xTKaF{L9qu>0A3NRcPPi3J7{;BN&B2N4DW+x0=q6Mc9OgVsID2B15*z#|=+| ztf_;O>x|B zQv!%Y;Y%B-BB@~)O0QCQz!wDcn8fFv-xhZitzkgHQzqW~G#iP1xy8tWmV76?aZ#l* zoQ@Sl9oUQpl&UClH<8CCYxGzY(A!aM0bo%O#iN zM&WyV{Q&a%(&VM!4|t3yvL+nHL&fFDNu!HXy#J)(u$agwxVcDE6Z@@i1pRLDra11m zDam`H@THAZk<_pYrB^9D;0pqJOyYCTXNxvp3HIc_AYjj%_(DQAADP|OBGgVkAY+zGnWf+@{%7$4 X@xtlDO$A=t00000NkvXXu0mjfNwtGI diff --git a/tests/expected/configured/spr_src1.png b/tests/expected/configured/spr_src1.png index 8aeb48a2d6a1c03a554d99b0fa006b8d71dc7775..b3c301e8271c15e67ee8cc03248ad96fd6c5fe1e 100644 GIT binary patch delta 723 zcmV;^0xbRZ1@;AyFMrce9LICjsq~-+PyS=jb_f-A@nk_S&O?K1*qFk~M8;5Q1sMeA ztcVJNSTU`R9TH>+BHA*&OvLt}ld(f`8KRd)JPZ%Ac^oJ|-!J@LiCIF7P1?(T@FjWg z{oZ?@{NC^VB6t}H!YGr<)MNsZPJJ1#d2jEI551f`z4|Oa0Dm<(yYfM~u+PgE$Iu6T zt8(@S&UFJ3IfReUM|93dm~Zu`@O`lgpKBGEm!*1H>PuCm_%S7$%%Jcc`)~|>&==>- zPYrK4VN@mvsQZG=@N01c)Vq5Zp)4hTD}!-x)1#rozm{gNwfu2zyD(fOfvhG=EBMt5 zx6aYV{#u%y0)L$IWIVmfVRB5+rbM0>&o7@^_Jgnsqc}Hl+{!nEi7~B(0Mr!7%7cj# zZWKt_M1e=A$QKPON)NN~Mi3a1#(|n40%=a5f#hyD+rM`cK<}RIf3T zVwtd4=v=7Ro=nZ9Vr;Xow6Uk&+&TZr?T2cH0AmUcQ>4ViVr6o}3+Cfv`6nK)8;}@g zbSSY^o`10F*im>reFlHFD17I+gTf=ryFr!O`niT~1l4UAkK^;tDe@78U}nJtM3n46aGqG?PyTRTTUF`-K)GU@bwooSt^!Bn8WjzQEZ5;{GrOa?`!NPR$l zV$?9}^yF<|su7GxU?x+V`_p?QrrQ=z(T&n<$4u6w@dEX8=thKmzstcMIXOG_0RDpHC{B1j=v zYeZBK#E40>^pHi0AfgG?OGQi%S}8qbFGci{6%WOORF4JaId6Fr#_cZawv*)24?cEh z=grP<-@KXCyabvy%w6Vga09tc&k|na-rgM@csYK0_k{|4u9jdntJjKpPpqVej}?;91RC%08TMfe#^RXS ziNQ4|Oqm-3`o1O!zZNGzzq@x4ihA@Wsi$-(e`0c5ByYO!qZ3s;(_@Rzw6xS1Y-2Ujm)Ti8B8 z@tBZL=#vVse`zQB2cSdWM2%<)rsMEE=ZBk}(+(52T ze9Ocr3rw_W;wr%~0<*Z|BA)JBqPq0*80{!ST1>VE^=IfgLE|#2mvaZ1QbB`!rEFR4 z*m!`_+rlG9{>;pmyB1zl9QC40MhA_HXGw^%vE?pi9)1;OYPX002ovPDHLk FV1ffWTs{B*