Skip to content

Commit 643a025

Browse files
committed
Auto merge of #14540 - RalfJung:docs-target, r=weihanglo
docs: Feature resolver version 2: clarify use of 'target' IIUC, these two uses of the word `target` right next to each other in the docs actually have different meaning. That is kind of confusing, so add disambiguators and links to the glossary that should help clarify this.
2 parents 9736f32 + 38b6ae0 commit 643a025

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/doc/src/reference/features.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -365,11 +365,11 @@ that unification can be unwanted. The exact situations are described in the
365365
[resolver chapter][resolver-v2], but in short, it avoids unifying in these
366366
situations:
367367

368-
* Features enabled on [platform-specific dependencies] for targets not
368+
* Features enabled on [platform-specific dependencies] for [target architectures][target] not
369369
currently being built are ignored.
370370
* [Build-dependencies] and proc-macros do not share features with normal
371371
dependencies.
372-
* [Dev-dependencies] do not activate features unless building a target that
372+
* [Dev-dependencies] do not activate features unless building a [Cargo target][target] that
373373
needs them (like tests or examples).
374374

375375
Avoiding the unification is necessary for some situations. For example, if a
@@ -393,6 +393,8 @@ the resolved features. For build dependencies, this is not necessary if you
393393
are cross-compiling with the `--target` flag because build dependencies are
394394
always built separately from normal dependencies in that scenario.
395395

396+
[target]: ../appendix/glossary.md#target
397+
396398
### Resolver version 2 command-line flags
397399

398400
The `resolver = "2"` setting also changes the behavior of the `--features` and

0 commit comments

Comments
 (0)