File tree
242 files changed
+1570
-1008
lines changed- crates
- cargo-test-support/src
- resolver-tests/src
- src
- bin/cargo/commands
- cargo
- core
- compiler
- resolver
- source
- ops
- cargo_add
- sources
- git
- registry
- util
- config
- toml
- doc
- contrib/src
- process
- tests
- man
- generated_txt
- includes
- src
- commands
- reference
- etc
- man
- tests
- build-std
- testsuite
- cargo_add
- build_prefer_existing_version
- in/dependency
- out/dependency
- detect_workspace_inherit_features
- in/primary
- out/primary
- detect_workspace_inherit_optional
- in/primary
- out/primary
- detect_workspace_inherit
- in/primary
- out/primary
- dev_prefer_existing_version
- in/dependency
- out/dependency
- git_branch
- git_dev
- git_inferred_name
- git_multiple_names
- git_registry
- git_rev
- git_tag
- git
- invalid_key_inherit_dependency
- in/primary
- out/primary
- invalid_key_overwrite_inherit_dependency
- in/primary
- out/primary
- invalid_key_rename_inherit_dependency
- in/primary
- out/primary
- list_features_path_no_default
- in
- dependency
- optional
- out/dependency
- list_features_path
- in
- dependency
- optional
- out/dependency
- locked_changed
- out
- locked_unchanged
- in
- src
- out
- lockfile_updated
- in
- src
- out
- merge_activated_features
- in/primary
- out/primary
- overwrite_inherit_features_noop
- in/primary
- out/primary
- overwrite_inherit_noop
- in/primary
- out/primary
- overwrite_inherit_optional_noop
- in/primary
- out/primary
- overwrite_optional_with_no_optional
- in
- out
- overwrite_preserves_inline_table
- in
- src
- out
- overwrite_version_with_git
- overwrite_workspace_dep_features
- in/primary
- out/primary
- overwrite_workspace_dep
- in/primary
- out/primary
- preserve_sorted
- in
- out
- preserve_unsorted
- in
- out
- unknown_inherited_feature
- in/primary
- out/primary
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
242 files changed
+1570
-1008
lines changedLines changed: 13 additions & 5 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
806 | 806 |
| |
807 | 807 |
| |
808 | 808 |
| |
809 |
| - | |
| 809 | + | |
| 810 | + | |
| 811 | + | |
| 812 | + | |
| 813 | + | |
| 814 | + | |
810 | 815 |
| |
811 |
| - | |
| 816 | + | |
812 | 817 |
| |
813 | 818 |
| |
814 | 819 |
| |
| |||
1139 | 1144 |
| |
1140 | 1145 |
| |
1141 | 1146 |
| |
1142 |
| - | |
| 1147 | + | |
| 1148 | + | |
| 1149 | + | |
| 1150 | + | |
1143 | 1151 |
| |
1144 | 1152 |
| |
1145 | 1153 |
| |
1146 |
| - | |
| 1154 | + | |
1147 | 1155 |
| |
1148 | 1156 |
| |
1149 | 1157 |
| |
1150 | 1158 |
| |
1151 | 1159 |
| |
1152 |
| - | |
| 1160 | + | |
1153 | 1161 |
| |
1154 | 1162 |
| |
1155 | 1163 |
| |
|
Lines changed: 7 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
12 | 12 |
| |
13 | 13 |
| |
14 | 14 |
| |
15 |
| - | |
| 15 | + | |
16 | 16 |
| |
17 | 17 |
| |
18 | 18 |
| |
| |||
128 | 128 |
| |
129 | 129 |
| |
130 | 130 |
| |
| 131 | + | |
131 | 132 |
| |
132 |
| - | |
133 | 133 |
| |
134 | 134 |
| |
135 |
| - | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
136 | 140 |
| |
137 | 141 |
| |
138 | 142 |
| |
|
Lines changed: 7 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
7 | 7 |
| |
8 | 8 |
| |
9 | 9 |
| |
| 10 | + | |
10 | 11 |
| |
11 | 12 |
| |
12 | 13 |
| |
| |||
193 | 194 |
| |
194 | 195 |
| |
195 | 196 |
| |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
196 | 203 |
| |
197 | 204 |
| |
198 | 205 |
| |
|
Lines changed: 4 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
55 | 55 |
| |
56 | 56 |
| |
57 | 57 |
| |
58 |
| - | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
59 | 62 |
| |
60 | 63 |
| |
61 | 64 |
| |
|
Lines changed: 1 addition & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
39 | 39 |
| |
40 | 40 |
| |
41 | 41 |
| |
42 |
| - | |
| 42 | + | |
43 | 43 |
| |
44 | 44 |
| |
45 | 45 |
| |
| |||
88 | 88 |
| |
89 | 89 |
| |
90 | 90 |
| |
91 |
| - | |
92 |
| - | |
93 |
| - | |
94 | 91 |
| |
95 | 92 |
| |
96 | 93 |
| |
|
Lines changed: 1 addition & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
2 | 2 |
| |
3 | 3 |
| |
4 | 4 |
| |
5 |
| - | |
| 5 | + | |
6 | 6 |
| |
7 | 7 |
| |
8 | 8 |
| |
| |||
65 | 65 |
| |
66 | 66 |
| |
67 | 67 |
| |
68 |
| - | |
69 |
| - | |
70 |
| - | |
71 | 68 |
| |
72 | 69 |
| |
73 | 70 |
| |
|
Lines changed: 2 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 | 2 |
| |
3 | 3 |
| |
4 |
| - | |
| 4 | + | |
5 | 5 |
| |
6 | 6 |
| |
7 | 7 |
| |
| |||
293 | 293 |
| |
294 | 294 |
| |
295 | 295 |
| |
296 |
| - | |
| 296 | + | |
297 | 297 |
| |
298 | 298 |
| |
299 | 299 |
| |
|
Lines changed: 7 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
86 | 86 |
| |
87 | 87 |
| |
88 | 88 |
| |
89 |
| - | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
90 | 92 |
| |
91 | 93 |
| |
92 | 94 |
| |
| |||
414 | 416 |
| |
415 | 417 |
| |
416 | 418 |
| |
417 |
| - | |
| 419 | + | |
418 | 420 |
| |
419 | 421 |
| |
420 | 422 |
| |
| |||
720 | 722 |
| |
721 | 723 |
| |
722 | 724 |
| |
| 725 | + | |
| 726 | + | |
723 | 727 |
| |
724 | 728 |
| |
725 | 729 |
| |
| |||
920 | 924 |
| |
921 | 925 |
| |
922 | 926 |
| |
923 |
| - | |
| 927 | + | |
924 | 928 |
| |
925 | 929 |
| |
926 | 930 |
| |
|
Lines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
8 | 8 |
| |
9 | 9 |
| |
10 | 10 |
| |
11 |
| - | |
| 11 | + | |
12 | 12 |
| |
13 | 13 |
| |
14 | 14 |
| |
|
Lines changed: 11 additions & 20 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
2 | 2 |
| |
3 | 3 |
| |
4 | 4 |
| |
5 |
| - | |
| 5 | + | |
6 | 6 |
| |
7 | 7 |
| |
8 | 8 |
| |
| |||
19 | 19 |
| |
20 | 20 |
| |
21 | 21 |
| |
| 22 | + | |
22 | 23 |
| |
23 |
| - | |
24 | 24 |
| |
25 | 25 |
| |
26 |
| - | |
| 26 | + | |
27 | 27 |
| |
28 |
| - | |
29 |
| - | |
| 28 | + | |
30 | 29 |
| |
31 | 30 |
| |
32 | 31 |
| |
| |||
327 | 326 |
| |
328 | 327 |
| |
329 | 328 |
| |
330 |
| - | |
| 329 | + | |
331 | 330 |
| |
332 | 331 |
| |
333 | 332 |
| |
| |||
483 | 482 |
| |
484 | 483 |
| |
485 | 484 |
| |
486 |
| - | |
| 485 | + | |
487 | 486 |
| |
488 | 487 |
| |
489 | 488 |
| |
| |||
575 | 574 |
| |
576 | 575 |
| |
577 | 576 |
| |
| 577 | + | |
578 | 578 |
| |
579 |
| - | |
580 | 579 |
| |
581 | 580 |
| |
582 | 581 |
| |
| |||
671 | 670 |
| |
672 | 671 |
| |
673 | 672 |
| |
674 |
| - | |
675 |
| - | |
676 |
| - | |
677 |
| - | |
678 |
| - | |
| 673 | + | |
679 | 674 |
| |
680 | 675 |
| |
681 | 676 |
| |
| |||
694 | 689 |
| |
695 | 690 |
| |
696 | 691 |
| |
697 |
| - | |
698 |
| - | |
699 |
| - | |
700 |
| - | |
701 |
| - | |
| 692 | + | |
702 | 693 |
| |
703 | 694 |
| |
704 | 695 |
| |
| |||
889 | 880 |
| |
890 | 881 |
| |
891 | 882 |
| |
892 |
| - | |
| 883 | + | |
893 | 884 |
| |
894 | 885 |
| |
895 | 886 |
| |
| |||
914 | 905 |
| |
915 | 906 |
| |
916 | 907 |
| |
917 |
| - | |
| 908 | + | |
918 | 909 |
| |
919 | 910 |
| |
920 | 911 |
| |
|
0 commit comments