Skip to content

Commit c0158e7

Browse files
committed
fix: Disambiguate each use of 'target'
1 parent 0aac9ab commit c0158e7

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

text/3692-feature-unification.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ This would be built-in support for "cargo-workspace-hack".
5151

5252
This would require effectively changing from
5353
1. Resolve dependencies
54-
2. Filter dependencies down for current target and selected packages
54+
2. Filter dependencies down for current build-target and selected packages
5555
3. Resolve features
5656

5757
To
5858
1. Resolve dependencies
59-
2. Filter dependencies down for current target
59+
2. Filter dependencies down for current build-target
6060
3. Resolve features
6161
4. Filter for selected packages
6262

@@ -158,9 +158,9 @@ versions locally and then have a job that resolves down to your MSRVs.
158158
### Unify features in other settings
159159

160160
[`workspace.resolver = "2"`](https://doc.rust-lang.org/cargo/reference/resolver.html#features) removed unification from the following scenarios
161-
- Cross-platform target unification
161+
- Cross-platform build-target unification
162162
- `build-dependencies` / `dependencies` unification
163-
- `dev-dependencies` / `dependencies` unification unless a dev target is enabled
163+
- `dev-dependencies` / `dependencies` unification unless a dev build-target is enabled
164164

165165
Depending on how we design this, the solution might be good enough to
166166
re-evaluate
@@ -173,8 +173,8 @@ Like with `resolver.incompatible-rust-version`, a solution for this would overri
173173
[`unify-target-host`](https://docs.rs/cargo-hakari/latest/cargo_hakari/config/index.html#unify-target-host):
174174
- [`none`](https://docs.rs/hakari/0.17.4/hakari/enum.UnifyTargetHost.html#variant.None): Perform no unification across the target and host feature sets.
175175
- The same as `resolver = "2"`
176-
- [`unify-if-both`](https://docs.rs/hakari/0.17.4/hakari/enum.UnifyTargetHost.html#variant.UnifyIfBoth): Perform unification across target and host feature sets, but only if a dependency is built on both the target and the host.
177-
- [`replicate-target-on-host`](https://docs.rs/hakari/0.17.4/hakari/enum.UnifyTargetHost.html#variant.ReplicateTargetOnHost): Perform unification across target and host feature sets, and also replicate all target-only lines to the host.
176+
- [`unify-if-both`](https://docs.rs/hakari/0.17.4/hakari/enum.UnifyTargetHost.html#variant.UnifyIfBoth): Perform unification across target and host feature sets, but only if a dependency is built on both the platform-target and the host.
177+
- [`replicate-target-on-host`](https://docs.rs/hakari/0.17.4/hakari/enum.UnifyTargetHost.html#variant.ReplicateTargetOnHost): Perform unification across platform-target and host feature sets, and also replicate all target-only lines to the host.
178178
- [`auto`](https://docs.rs/hakari/0.17.4/hakari/enum.UnifyTargetHost.html#variant.Auto) (default): select `replicate-target-on-host` if a workspace member may be built for the host (used as a proc-macro or build-dependency)
179179

180180
`unify-target-host` might be somewhat related to [`-Ztarget-applies-to-host`](https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#target-applies-to-host)

0 commit comments

Comments
 (0)