]> git.proxmox.com Git - cargo.git/commit
Auto merge of #10799 - Urgau:check-cfg-fix-config-deserialization, r=ehuss
authorbors <bors@rust-lang.org>
Wed, 29 Jun 2022 22:13:09 +0000 (22:13 +0000)
committerbors <bors@rust-lang.org>
Wed, 29 Jun 2022 22:13:09 +0000 (22:13 +0000)
commit42311063f0c5541e41489a5b10361d2534bcdd87
treee3195b90724a6eb6c6dca1aeb487d133327f2fa6
parenta3ae66804caaa7aefccc8dcf16fe51e85a4c214d
parent23f59d4eeb85de6766b3dd7b3d0ee4d19a448c13
Auto merge of #10799 - Urgau:check-cfg-fix-config-deserialization, r=ehuss

Fix deserialization of check-cfg in config.toml

When improving the check-cfg implementation in https://github.com/rust-lang/cargo/pull/10566 I changed the internal representation of `check_cfg` from multiple `bool` options to one `Option<(bool, bool, bool, bool)>` but I didn't realize until https://github.com/rust-lang/rust/issues/82450#issuecomment-1169836928 that the internal representation is actually somewhat public as it's used in the `[unstable]` in `.cargo/config.toml`.

And because TOML cannot represent tuples there is no way to set it from the `[unstable]` section. This PR fix this oversight by using a custom deserializer method similar to what was already done for `build-std`.