Skip to content

Commit 151f12f

Browse files
matkladmatklad
committed
Use a single profile set per workspace
1 parent eca9e15 commit 151f12f

File tree

6 files changed

+117
-6
lines changed

6 files changed

+117
-6
lines changed

‎src/cargo/core/manifest.rs

+9-2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ pub struct Manifest {
3333
pub struct VirtualManifest {
3434
replace: Vec<(PackageIdSpec, Dependency)>,
3535
workspace: WorkspaceConfig,
36+
profiles: Profiles,
3637
}
3738

3839
/// General metadata about a package which is just blindly uploaded to the
@@ -139,7 +140,7 @@ pub struct Profile {
139140
pub panic: Option<String>,
140141
}
141142

142-
#[derive(Default, Clone, Debug)]
143+
#[derive(Default, Clone, Debug, PartialEq, Eq)]
143144
pub struct Profiles {
144145
pub release: Profile,
145146
pub dev: Profile,
@@ -250,10 +251,12 @@ impl Manifest {
250251

251252
impl VirtualManifest {
252253
pub fn new(replace: Vec<(PackageIdSpec, Dependency)>,
253-
workspace: WorkspaceConfig) -> VirtualManifest {
254+
workspace: WorkspaceConfig,
255+
profiles: Profiles) -> VirtualManifest {
254256
VirtualManifest {
255257
replace: replace,
256258
workspace: workspace,
259+
profiles: profiles,
257260
}
258261
}
259262

@@ -264,6 +267,10 @@ impl VirtualManifest {
264267
pub fn workspace_config(&self) -> &WorkspaceConfig {
265268
&self.workspace
266269
}
270+
271+
pub fn profiles(&self) -> &Profiles {
272+
&self.profiles
273+
}
267274
}
268275

269276
impl Target {

‎src/cargo/core/workspace.rs

+36-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::path::{Path, PathBuf};
44
use std::slice;
55

66
use core::{Package, VirtualManifest, EitherManifest, SourceId};
7-
use core::{PackageIdSpec, Dependency};
7+
use core::{PackageIdSpec, Dependency, Profile, Profiles};
88
use ops;
99
use util::{Config, CargoResult, Filesystem, human};
1010
use util::paths;
@@ -162,6 +162,14 @@ impl<'cfg> Workspace<'cfg> {
162162
self.config
163163
}
164164

165+
pub fn profiles(&self) -> &Profiles {
166+
let root = self.root_manifest.as_ref().unwrap_or(&self.current_manifest);
167+
match *self.packages.get(root) {
168+
MaybePackage::Package(ref p) => p.manifest().profiles(),
169+
MaybePackage::Virtual(ref m) => m.profiles(),
170+
}
171+
}
172+
165173
/// Returns the root path of this workspace.
166174
///
167175
/// That is, this returns the path of the directory containing the
@@ -432,6 +440,33 @@ impl<'cfg> Workspace<'cfg> {
432440
extra);
433441
}
434442

443+
if let Some(ref root_manifest) = self.root_manifest {
444+
let default_profiles = Profiles {
445+
release: Profile::default_release(),
446+
dev: Profile::default_dev(),
447+
test: Profile::default_test(),
448+
test_deps: Profile::default_dev(),
449+
bench: Profile::default_bench(),
450+
bench_deps: Profile::default_release(),
451+
doc: Profile::default_doc(),
452+
custom_build: Profile::default_custom_build(),
453+
};
454+
455+
for pkg in self.members().filter(|p| p.manifest_path() != root_manifest) {
456+
if pkg.manifest().profiles() != &default_profiles {
457+
let message = &format!("profiles for the non root package will be ignored, \
458+
specify profiles at the workspace root:\n\
459+
package: {}\n\
460+
workspace: {}",
461+
pkg.manifest_path().display(),
462+
root_manifest.display());
463+
464+
//TODO: remove `Eq` bound from `Profiles` when the warning is removed.
465+
try!(self.config.shell().warn(&message));
466+
}
467+
}
468+
}
469+
435470
Ok(())
436471
}
437472
}

‎src/cargo/ops/cargo_clean.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pub fn clean(ws: &Workspace, opts: &CleanOptions) -> CargoResult<()> {
3232
let resolve = try!(ops::resolve_ws(&mut registry, ws));
3333
let packages = ops::get_resolved_packages(&resolve, registry);
3434

35-
let profiles = try!(ws.current()).manifest().profiles();
35+
let profiles = ws.profiles();
3636
let host_triple = try!(opts.config.rustc()).host.clone();
3737
let mut cx = try!(Context::new(ws, &resolve, &packages, opts.config,
3838
BuildConfig {

‎src/cargo/ops/cargo_compile.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ pub fn compile_ws<'a>(ws: &Workspace<'a>,
169169
bail!("jobs must be at least 1")
170170
}
171171

172-
let profiles = root_package.manifest().profiles();
172+
let profiles = ws.profiles();
173173
if spec.len() == 0 {
174174
try!(generate_targets(root_package, profiles, mode, filter, release));
175175
}

‎src/cargo/util/toml.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,7 @@ impl TomlManifest {
725725
platform: None,
726726
layout: layout,
727727
}));
728+
let profiles = build_profiles(&self.profile);
728729
let workspace_config = match self.workspace {
729730
Some(ref config) => {
730731
WorkspaceConfig::Root { members: config.members.clone() }
@@ -733,7 +734,7 @@ impl TomlManifest {
733734
bail!("virtual manifests must be configured with [workspace]");
734735
}
735736
};
736-
Ok((VirtualManifest::new(replace, workspace_config), nested_paths))
737+
Ok((VirtualManifest::new(replace, workspace_config, profiles), nested_paths))
737738
}
738739

739740
fn replace(&self, cx: &mut Context)

‎tests/profiles.rs

+68
Original file line numberDiff line numberDiff line change
@@ -187,3 +187,71 @@ fn top_level_overrides_deps() {
187187
prefix = env::consts::DLL_PREFIX,
188188
suffix = env::consts::DLL_SUFFIX)));
189189
}
190+
191+
#[test]
192+
fn profile_in_non_root_manifest_triggers_a_warning() {
193+
let p = project("foo")
194+
.file("Cargo.toml", r#"
195+
[project]
196+
name = "foo"
197+
version = "0.1.0"
198+
authors = []
199+
200+
[workspace]
201+
members = ["bar"]
202+
203+
[profile.dev]
204+
debug = false
205+
"#)
206+
.file("src/main.rs", "fn main() {}")
207+
.file("bar/Cargo.toml", r#"
208+
[project]
209+
name = "bar"
210+
version = "0.1.0"
211+
authors = []
212+
workspace = ".."
213+
214+
[profile.dev]
215+
opt-level = 1
216+
"#)
217+
.file("bar/src/main.rs", "fn main() {}");
218+
p.build();
219+
220+
assert_that(p.cargo_process("build").cwd(p.root().join("bar")).arg("-v"),
221+
execs().with_status(0).with_stderr("\
222+
[WARNING] profiles for the non root package will be ignored, specify profiles at the workspace root:
223+
package: [..]
224+
workspace: [..]
225+
[COMPILING] bar v0.1.0 ([..])
226+
[RUNNING] `rustc [..]`
227+
[FINISHED] debug [unoptimized] target(s) in [..]"));
228+
}
229+
230+
#[test]
231+
fn profile_in_virtual_manifest_works() {
232+
let p = project("foo")
233+
.file("Cargo.toml", r#"
234+
[workspace]
235+
members = ["bar"]
236+
237+
[profile.dev]
238+
opt-level = 1
239+
debug = false
240+
"#)
241+
.file("src/main.rs", "fn main() {}")
242+
.file("bar/Cargo.toml", r#"
243+
[project]
244+
name = "bar"
245+
version = "0.1.0"
246+
authors = []
247+
workspace = ".."
248+
"#)
249+
.file("bar/src/main.rs", "fn main() {}");
250+
p.build();
251+
252+
assert_that(p.cargo_process("build").cwd(p.root().join("bar")).arg("-v"),
253+
execs().with_status(0).with_stderr("\
254+
[COMPILING] bar v0.1.0 ([..])
255+
[RUNNING] `rustc [..]`
256+
[FINISHED] debug [optimized] target(s) in [..]"));
257+
}

0 commit comments

Comments
 (0)