Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add default_run to SerializedPackage #9550

Merged
merged 3 commits into from
Jun 9, 2021
Merged

add default_run to SerializedPackage #9550

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9a5625
add default_run to SerializedPackage
Rustin170506 Jun 7, 2021
c971400
Make test happy
Rustin170506 Jun 7, 2021
1abc4f2
Add test and update docs
Rustin170506 Jun 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add test and update docs
  • Loading branch information
@Rustin170506
Rustin170506 committed Jun 8, 2021
commit 1abc4f2e8aa4f6e944217233892566e080a8a9c1
2 changes: 2 additions & 0 deletions src/doc/man/cargo-metadata.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ The output has the following format:
"categories": [
"command-line-utilities"
],
/* Optional string that is the default binary picked by cargo run. */
"default_run": null,
/* Array of keywords from the manifest. */
"keywords": [
"cli"
Expand Down
2 changes: 2 additions & 0 deletions src/doc/man/generated_txt/cargo-metadata.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@ OUTPUT FORMAT
"categories": [
"command-line-utilities"
],
/* Optional string that is the default binary picked by cargo run. */
"default_run": null,
/* Array of keywords from the manifest. */
"keywords": [
"cli"
Expand Down
2 changes: 2 additions & 0 deletions src/doc/src/commands/cargo-metadata.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ The output has the following format:
"categories": [
"command-line-utilities"
],
/* Optional string that is the default binary picked by cargo run. */
"default_run": null,
/* Array of keywords from the manifest. */
"keywords": [
"cli"
Expand Down
2 changes: 2 additions & 0 deletions src/etc/man/cargo-metadata.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ The output has the following format:
"categories": [
"command\-line\-utilities"
],
/* Optional string that is the default binary picked by cargo run. */
"default_run": null,
/* Array of keywords from the manifest. */
"keywords": [
"cli"
Expand Down
120 changes: 120 additions & 0 deletions tests/testsuite/metadata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1532,6 +1532,126 @@ fn package_edition_2018() {
.run();
}

#[cargo_test]
fn package_default_run() {
let p = project()
.file("src/lib.rs", "")
.file("src/bin/a.rs", r#"fn main() { println!("hello A"); }"#)
.file("src/bin/b.rs", r#"fn main() { println!("hello B"); }"#)
.file(
"Cargo.toml",
r#"
[project]
name = "foo"
version = "0.1.0"
authors = ["wycats@example.com"]
edition = "2018"
default-run = "a"
"#,
)
.build();
p.cargo("metadata")
.with_json(
r#"
{
"packages": [
{
"authors": [
"wycats@example.com"
],
"categories": [],
"default_run": "a",
"dependencies": [],
"description": null,
"edition": "2018",
"features": {},
"id": "foo 0.1.0 (path+file:[..])",
"keywords": [],
"license": null,
"license_file": null,
"links": null,
"manifest_path": "[..]Cargo.toml",
"metadata": null,
"publish": null,
"name": "foo",
"readme": null,
"repository": null,
"homepage": null,
"documentation": null,
"source": null,
"targets": [
{
"crate_types": [
"lib"
],
"doc": true,
"doctest": true,
"test": true,
"edition": "2018",
"kind": [
"lib"
],
"name": "foo",
"src_path": "[..]src/lib.rs"
},
{
"crate_types": [
"bin"
],
"doc": true,
"doctest": false,
"test": true,
"edition": "2018",
"kind": [
"bin"
],
"name": "a",
"src_path": "[..]src/bin/a.rs",
"test": true
},
{
"crate_types": [
"bin"
],
"doc": true,
"doctest": false,
"test": true,
"edition": "2018",
"kind": [
"bin"
],
"name": "b",
"src_path": "[..]src/bin/b.rs",
"test": true
}
],
"version": "0.1.0"
}
],
"resolve": {
"nodes": [
{
"dependencies": [],
"deps": [],
"features": [],
"id": "foo 0.1.0 (path+file:[..])"
}
],
"root": "foo 0.1.0 (path+file:[..])"
},
"target_directory": "[..]",
"version": 1,
"workspace_members": [
"foo 0.1.0 (path+file:[..])"
],
"workspace_root": "[..]",
"metadata": null
}
"#,
)
.run();
}

#[cargo_test]
fn target_edition_2018() {
let p = project()
Expand Down