development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-10-02 14:04:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add workspace root to metadata command.

Browse source 
Fixes #4933
This commit is contained in:
Eric Huss 2018-01-13 11:51:36 -08:00
parent 929392dc63
commit fef215d3d3
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/cargo/ops/cargo_output_metadata.rs
View file

@ -39,6 +39,7 @@ fn metadata_no_deps(ws: &Workspace,
resolve: None,
target_directory: ws.target_dir().display().to_string(),
version: VERSION,
workspace_root: ws.root().display().to_string(),
})
}
@ -66,6 +67,7 @@ fn metadata_full(ws: &Workspace,
}),
target_directory: ws.target_dir().display().to_string(),
version: VERSION,
workspace_root: ws.root().display().to_string(),
})
}
@ -76,6 +78,7 @@ pub struct ExportInfo {
resolve: Option<MetadataResolve>,
target_directory: String,
version: u32,
workspace_root: String,
}
/// Newtype wrapper to provide a custom `Serialize` implementation.

24
tests/metadata.rs
View file

@ -51,7 +51,8 @@ fn cargo_metadata_simple() {
"root": "foo 0.5.0 (path+file:[..]foo)"
},
"target_directory": "[..]foo[/]target",
"version": 1
"version": 1,
"workspace_root": "[..][/]foo"
}"#));
}
@ -125,7 +126,8 @@ crate-type = ["lib", "staticlib"]
"root": "foo 0.5.0 (path+file:[..]foo)"
},
"target_directory": "[..]foo[/]target",
"version": 1
"version": 1,
"workspace_root": "[..][/]foo"
}"#));
}
@ -275,7 +277,8 @@ fn cargo_metadata_with_deps_and_version() {
"root": "foo 0.5.0 (path+file:[..]foo)"
},
"target_directory": "[..]foo[/]target",
"version": 1
"version": 1,
"workspace_root": "[..][/]foo"
}"#));
}
@ -337,7 +340,8 @@ name = "ex"
]
},
"target_directory": "[..]foo[/]target",
"version": 1
"version": 1,
"workspace_root": "[..][/]foo"
}"#));
}
@ -400,7 +404,8 @@ crate-type = ["rlib", "dylib"]
]
},
"target_directory": "[..]foo[/]target",
"version": 1
"version": 1,
"workspace_root": "[..][/]foo"
}"#));
}
@ -476,7 +481,8 @@ fn workspace_metadata() {
"root": null
},
"target_directory": "[..]foo[/]target",
"version": 1
"version": 1,
"workspace_root": "[..][/]foo"
}"#))
}
@ -540,7 +546,8 @@ fn workspace_metadata_no_deps() {
"workspace_members": ["baz 0.5.0 (path+file:[..]baz)", "bar 0.5.0 (path+file:[..]bar)"],
"resolve": null,
"target_directory": "[..]foo[/]target",
"version": 1
"version": 1,
"workspace_root": "[..][/]foo"
}"#))
}
@ -582,7 +589,8 @@ const MANIFEST_OUTPUT: &'static str=
"workspace_members": [ "foo 0.5.0 (path+file:[..]foo)" ],
"resolve": null,
"target_directory": "[..]foo[/]target",
"version": 1
"version": 1,
"workspace_root": "[..][/]foo"
}"#;
#[test]