]> git.proxmox.com Git - cargo.git/commitdiff
Auto merge of #9839 - jonhoo:prefer-cargo-toml-patch, r=ehuss
authorbors <bors@rust-lang.org>
Wed, 1 Sep 2021 04:55:13 +0000 (04:55 +0000)
committerbors <bors@rust-lang.org>
Wed, 1 Sep 2021 04:55:13 +0000 (04:55 +0000)
Stabilize patch-in-config (and prefer config over manifest)

Tracking issue: https://github.com/rust-lang/cargo/issues/9269

---

This stabilizes the `patch-in-config` feature ([unstable entry](https://doc.rust-lang.org/cargo/reference/unstable.html#patch-in-config)) following the discussion in https://github.com/rust-lang/cargo/issues/9269#issuecomment-904913263.

As requested, this PR _also_ changes the precedence behavior such that a `[patch]` for the same dependency in both `.cargo/config.toml` and `Cargo.toml` prefers the patch from the configuration file over the one from the manifest, which matches the behavior of other overlapping configuration options. The corresponding test has also been updated to reflect this change in behavior.

1  2 
tests/testsuite/patch.rs

Simple merge