Skip to content

Commit 66686fd

Browse files
borsbors
committed
Auto merge of #9550 - hi-rustin:rustin-patch-feat, r=ehuss
add default_run to SerializedPackage close #9497
2 parents 2544bd3 + 1abc4f2 commit 66686fd

File tree

11 files changed

+174
-0
lines changed

11 files changed

+174
-0
lines changed

‎src/cargo/core/package.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ pub struct SerializedPackage {
102102
links: Option<String>,
103103
#[serde(skip_serializing_if = "Option::is_none")]
104104
metabuild: Option<Vec<String>>,
105+
default_run: Option<String>,
105106
}
106107

107108
impl Package {
@@ -267,6 +268,7 @@ impl Package {
267268
links: self.manifest().links().map(|s| s.to_owned()),
268269
metabuild: self.manifest().metabuild().cloned(),
269270
publish: self.publish().as_ref().cloned(),
271+
default_run: self.manifest().default_run().map(|s| s.to_owned()),
270272
}
271273
}
272274
}

‎src/doc/man/cargo-metadata.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,8 @@ The output has the following format:
180180
"categories": [
181181
"command-line-utilities"
182182
],
183+
/* Optional string that is the default binary picked by cargo run. */
184+
"default_run": null,
183185
/* Array of keywords from the manifest. */
184186
"keywords": [
185187
"cli"

‎src/doc/man/generated_txt/cargo-metadata.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ OUTPUT FORMAT
175175
"categories": [
176176
"command-line-utilities"
177177
],
178+
/* Optional string that is the default binary picked by cargo run. */
179+
"default_run": null,
178180
/* Array of keywords from the manifest. */
179181
"keywords": [
180182
"cli"

‎src/doc/src/commands/cargo-metadata.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,8 @@ The output has the following format:
180180
"categories": [
181181
"command-line-utilities"
182182
],
183+
/* Optional string that is the default binary picked by cargo run. */
184+
"default_run": null,
183185
/* Array of keywords from the manifest. */
184186
"keywords": [
185187
"cli"

‎src/etc/man/cargo-metadata.1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,8 @@ The output has the following format:
177177
"categories": [
178178
"command\-line\-utilities"
179179
],
180+
/* Optional string that is the default binary picked by cargo run. */
181+
"default_run": null,
180182
/* Array of keywords from the manifest. */
181183
"keywords": [
182184
"cli"

‎tests/testsuite/alt_registry.rs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -829,6 +829,7 @@ fn alt_reg_metadata() {
829829
"publish": null,
830830
"authors": [],
831831
"categories": [],
832+
"default_run": null,
832833
"keywords": [],
833834
"readme": null,
834835
"repository": null,
@@ -885,6 +886,7 @@ fn alt_reg_metadata() {
885886
"publish": null,
886887
"authors": [],
887888
"categories": [],
889+
"default_run": null,
888890
"keywords": [],
889891
"readme": null,
890892
"repository": null,
@@ -909,6 +911,7 @@ fn alt_reg_metadata() {
909911
"publish": null,
910912
"authors": [],
911913
"categories": [],
914+
"default_run": null,
912915
"keywords": [],
913916
"readme": null,
914917
"repository": null,
@@ -933,6 +936,7 @@ fn alt_reg_metadata() {
933936
"publish": null,
934937
"authors": [],
935938
"categories": [],
939+
"default_run": null,
936940
"keywords": [],
937941
"readme": null,
938942
"repository": null,
@@ -982,6 +986,7 @@ fn alt_reg_metadata() {
982986
"publish": null,
983987
"authors": [],
984988
"categories": [],
989+
"default_run": null,
985990
"keywords": [],
986991
"readme": null,
987992
"repository": null,
@@ -1019,6 +1024,7 @@ fn alt_reg_metadata() {
10191024
"publish": null,
10201025
"authors": [],
10211026
"categories": [],
1027+
"default_run": null,
10221028
"keywords": [],
10231029
"readme": null,
10241030
"repository": null,
@@ -1115,6 +1121,7 @@ fn unknown_registry() {
11151121
"publish": null,
11161122
"authors": [],
11171123
"categories": [],
1124+
"default_run": null,
11181125
"keywords": [],
11191126
"readme": null,
11201127
"repository": null,
@@ -1139,6 +1146,7 @@ fn unknown_registry() {
11391146
"publish": null,
11401147
"authors": [],
11411148
"categories": [],
1149+
"default_run": null,
11421150
"keywords": [],
11431151
"readme": null,
11441152
"repository": null,
@@ -1176,6 +1184,7 @@ fn unknown_registry() {
11761184
"publish": null,
11771185
"authors": [],
11781186
"categories": [],
1187+
"default_run": null,
11791188
"keywords": [],
11801189
"readme": null,
11811190
"repository": null,

‎tests/testsuite/features_namespaced.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,7 @@ fn json_exposed() {
766766
"publish": null,
767767
"authors": [],
768768
"categories": [],
769+
"default_run": null,
769770
"keywords": [],
770771
"readme": null,
771772
"repository": null,

‎tests/testsuite/git.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3081,6 +3081,7 @@ fn metadata_master_consistency() {
30813081
"publish": null,
30823082
"authors": [],
30833083
"categories": [],
3084+
"default_run": null,
30843085
"keywords": [],
30853086
"readme": null,
30863087
"repository": null,
@@ -3118,6 +3119,7 @@ fn metadata_master_consistency() {
31183119
"publish": null,
31193120
"authors": [],
31203121
"categories": [],
3122+
"default_run": null,
31213123
"keywords": [],
31223124
"readme": null,
31233125
"repository": null,

0 commit comments

Comments
 (0)