Skip to content

Commit 6c79cf9

Browse files
borsbors
committed
Auto merge of #3534 - sfackler:opt-level, r=alexcrichton
Allow debuginfo level to be specified `true` is mapped to `2`, which matches current behavior. r? @alexcrichton
2 parents 6291619 + 6d864a8 commit 6c79cf9

File tree

13 files changed

+92
-48
lines changed

13 files changed

+92
-48
lines changed

‎src/cargo/core/manifest.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ pub struct Profile {
130130
pub codegen_units: Option<u32>, // None = use rustc default
131131
pub rustc_args: Option<Vec<String>>,
132132
pub rustdoc_args: Option<Vec<String>>,
133-
pub debuginfo: bool,
133+
pub debuginfo: Option<u32>,
134134
pub debug_assertions: bool,
135135
pub rpath: bool,
136136
pub test: bool,
@@ -143,7 +143,7 @@ pub struct Profile {
143143
#[derive(RustcEncodable)]
144144
struct SerializedProfile<'a> {
145145
opt_level: &'a str,
146-
debuginfo: bool,
146+
debuginfo: Option<u32>,
147147
debug_assertions: bool,
148148
test: bool,
149149
}
@@ -488,7 +488,7 @@ impl fmt::Display for Target {
488488
impl Profile {
489489
pub fn default_dev() -> Profile {
490490
Profile {
491-
debuginfo: true,
491+
debuginfo: Some(2),
492492
debug_assertions: true,
493493
..Profile::default()
494494
}
@@ -497,7 +497,7 @@ impl Profile {
497497
pub fn default_release() -> Profile {
498498
Profile {
499499
opt_level: "3".to_string(),
500-
debuginfo: false,
500+
debuginfo: None,
501501
..Profile::default()
502502
}
503503
}
@@ -554,7 +554,7 @@ impl Default for Profile {
554554
codegen_units: None,
555555
rustc_args: None,
556556
rustdoc_args: None,
557-
debuginfo: false,
557+
debuginfo: None,
558558
debug_assertions: false,
559559
rpath: false,
560560
test: false,

‎src/cargo/ops/cargo_rustc/custom_build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ fn build_work<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>)
107107
Kind::Host => cx.host_triple(),
108108
Kind::Target => cx.target_triple(),
109109
})
110-
.env("DEBUG", &profile.debuginfo.to_string())
110+
.env("DEBUG", &profile.debuginfo.is_some().to_string())
111111
.env("OPT_LEVEL", &profile.opt_level)
112112
.env("PROFILE", if cx.build_config.release { "release" } else { "debug" })
113113
.env("HOST", cx.host_triple())

‎src/cargo/ops/cargo_rustc/job_queue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ impl<'a> JobQueue<'a> {
201201
let profile = cx.lib_profile();
202202
let mut opt_type = String::from(if profile.opt_level == "0" { "unoptimized" }
203203
else { "optimized" });
204-
if profile.debuginfo {
204+
if profile.debuginfo.is_some() {
205205
opt_type = opt_type + " + debuginfo";
206206
}
207207
let duration = start_time.elapsed();

‎src/cargo/ops/cargo_rustc/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ pub fn compile_targets<'a, 'cfg: 'a>(ws: &Workspace<'cfg>,
9494
resolve: &'a Resolve,
9595
config: &'cfg Config,
9696
build_config: BuildConfig,
97-
profiles: &'a Profiles,
97+
profiles: &'a Profiles,
9898
exec: Arc<Executor>)
9999
-> CargoResult<Compilation<'cfg>> {
100100
let units = pkg_targets.iter().flat_map(|&(pkg, ref targets)| {
@@ -659,8 +659,8 @@ fn build_base_args(cx: &mut Context,
659659
}
660660
}
661661

662-
if debuginfo {
663-
cmd.arg("-g");
662+
if let Some(debuginfo) = debuginfo {
663+
cmd.arg("-C").arg(format!("debuginfo={}", debuginfo));
664664
}
665665

666666
if let Some(ref args) = *rustc_args {

‎src/cargo/util/toml.rs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,12 +276,18 @@ impl Decodable for TomlOptLevel {
276276
}
277277
}
278278

279+
#[derive(RustcDecodable, Clone)]
280+
pub enum U32OrBool {
281+
U32(u32),
282+
Bool(bool),
283+
}
284+
279285
#[derive(RustcDecodable, Clone, Default)]
280286
pub struct TomlProfile {
281287
opt_level: Option<TomlOptLevel>,
282288
lto: Option<bool>,
283289
codegen_units: Option<u32>,
284-
debug: Option<bool>,
290+
debug: Option<U32OrBool>,
285291
debug_assertions: Option<bool>,
286292
rpath: Option<bool>,
287293
panic: Option<String>,
@@ -1265,12 +1271,18 @@ fn build_profiles(profiles: &Option<TomlProfiles>) -> Profiles {
12651271

12661272
fn merge(profile: Profile, toml: Option<&TomlProfile>) -> Profile {
12671273
let &TomlProfile {
1268-
ref opt_level, lto, codegen_units, debug, debug_assertions, rpath,
1274+
ref opt_level, lto, codegen_units, ref debug, debug_assertions, rpath,
12691275
ref panic
12701276
} = match toml {
12711277
Some(toml) => toml,
12721278
None => return profile,
12731279
};
1280+
let debug = match *debug {
1281+
Some(U32OrBool::U32(debug)) => Some(Some(debug)),
1282+
Some(U32OrBool::Bool(true)) => Some(Some(2)),
1283+
Some(U32OrBool::Bool(false)) => Some(None),
1284+
None => None,
1285+
};
12741286
Profile {
12751287
opt_level: opt_level.clone().unwrap_or(TomlOptLevel(profile.opt_level)).0,
12761288
lto: lto.unwrap_or(profile.lto),

‎src/doc/manifest.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,8 @@ along with the defaults for each profile.
181181
# The development profile, used for `cargo build`.
182182
[profile.dev]
183183
opt-level = 0 # controls the `--opt-level` the compiler builds with
184-
debug = true # controls whether the compiler passes `-g`
184+
debug = true # controls whether the compiler passes `-C debuginfo`
185+
# a value of `true` is equivalent to `2`
185186
rpath = false # controls whether the compiler passes `-C rpath`
186187
lto = false # controls `-C lto` for binaries and staticlibs
187188
debug-assertions = true # controls whether debug assertions are enabled
@@ -202,7 +203,7 @@ panic = 'unwind'
202203
# The testing profile, used for `cargo test`.
203204
[profile.test]
204205
opt-level = 0
205-
debug = true
206+
debug = 2
206207
rpath = false
207208
lto = false
208209
debug-assertions = true
@@ -222,7 +223,7 @@ panic = 'unwind'
222223
# The documentation profile, used for `cargo doc`.
223224
[profile.doc]
224225
opt-level = 0
225-
debug = true
226+
debug = 2
226227
rpath = false
227228
lto = false
228229
debug-assertions = true

‎tests/build-lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ fn verbose_output_for_lib(p: &ProjectBuilder) -> String {
88
format!("\
99
[COMPILING] {name} v{version} ({url})
1010
[RUNNING] `rustc --crate-name {name} src[/]lib.rs --crate-type lib \
11-
--emit=dep-info,link -g \
11+
--emit=dep-info,link -C debuginfo=2 \
1212
-C metadata=[..] \
1313
--out-dir [..] \
1414
-L dependency={dir}[/]target[/]debug[/]deps`

‎tests/build-script.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ fn custom_build_script_rustc_flags() {
184184
execs().with_status(101)
185185
.with_stderr(&format!("\
186186
[COMPILING] bar v0.5.0 ({url})
187-
[RUNNING] `rustc --crate-name test {dir}{sep}src{sep}lib.rs --crate-type lib -g \
187+
[RUNNING] `rustc --crate-name test {dir}{sep}src{sep}lib.rs --crate-type lib -C debuginfo=2 \
188188
-C metadata=[..] \
189189
-C extra-filename=-[..] \
190190
--out-dir {dir}{sep}target \
@@ -766,19 +766,19 @@ fn build_cmd_with_a_build_cmd() {
766766
[RUNNING] `rustc [..] a[/]build.rs [..] --extern b=[..]`
767767
[RUNNING] `[..][/]a-[..][/]build-script-build`
768768
[RUNNING] `rustc --crate-name a [..]lib.rs --crate-type lib \
769-
--emit=dep-info,link -g \
769+
--emit=dep-info,link -C debuginfo=2 \
770770
-C metadata=[..] \
771771
--out-dir [..]target[/]debug[/]deps \
772772
-L [..]target[/]debug[/]deps`
773773
[COMPILING] foo v0.5.0 (file://[..])
774774
[RUNNING] `rustc --crate-name build_script_build build.rs --crate-type bin \
775775
--emit=dep-info,link \
776-
-g -C metadata=[..] --out-dir [..] \
776+
-C debuginfo=2 -C metadata=[..] --out-dir [..] \
777777
-L [..]target[/]debug[/]deps \
778778
--extern a=[..]liba[..].rlib`
779779
[RUNNING] `[..][/]foo-[..][/]build-script-build`
780780
[RUNNING] `rustc --crate-name foo [..]lib.rs --crate-type lib \
781-
--emit=dep-info,link -g \
781+
--emit=dep-info,link -C debuginfo=2 \
782782
-C metadata=[..] \
783783
--out-dir [..] \
784784
-L [..]target[/]debug[/]deps`

‎tests/build.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -821,13 +821,13 @@ fn cargo_default_env_metadata_env_var() {
821821
[COMPILING] bar v0.0.1 ({url}/bar)
822822
[RUNNING] `rustc --crate-name bar bar[/]src[/]lib.rs --crate-type dylib \
823823
--emit=dep-info,link \
824-
-C prefer-dynamic -g \
824+
-C prefer-dynamic -C debuginfo=2 \
825825
-C metadata=[..] \
826826
--out-dir [..] \
827827
-L dependency={dir}[/]target[/]debug[/]deps`
828828
[COMPILING] foo v0.0.1 ({url})
829829
[RUNNING] `rustc --crate-name foo src[/]lib.rs --crate-type lib \
830-
--emit=dep-info,link -g \
830+
--emit=dep-info,link -C debuginfo=2 \
831831
-C metadata=[..] \
832832
-C extra-filename=[..] \
833833
--out-dir [..] \
@@ -848,13 +848,13 @@ suffix = env::consts::DLL_SUFFIX,
848848
[COMPILING] bar v0.0.1 ({url}/bar)
849849
[RUNNING] `rustc --crate-name bar bar[/]src[/]lib.rs --crate-type dylib \
850850
--emit=dep-info,link \
851-
-C prefer-dynamic -g \
851+
-C prefer-dynamic -C debuginfo=2 \
852852
-C metadata=[..] \
853853
--out-dir [..] \
854854
-L dependency={dir}[/]target[/]debug[/]deps`
855855
[COMPILING] foo v0.0.1 ({url})
856856
[RUNNING] `rustc --crate-name foo src[/]lib.rs --crate-type lib \
857-
--emit=dep-info,link -g \
857+
--emit=dep-info,link -C debuginfo=2 \
858858
-C metadata=[..] \
859859
-C extra-filename=[..] \
860860
--out-dir [..] \
@@ -1198,7 +1198,7 @@ fn verbose_build() {
11981198
execs().with_status(0).with_stderr(&format!("\
11991199
[COMPILING] test v0.0.0 ({url})
12001200
[RUNNING] `rustc --crate-name test src[/]lib.rs --crate-type lib \
1201-
--emit=dep-info,link -g \
1201+
--emit=dep-info,link -C debuginfo=2 \
12021202
-C metadata=[..] \
12031203
--out-dir [..] \
12041204
-L dependency={dir}[/]target[/]debug[/]deps`
@@ -2443,7 +2443,7 @@ fn compiler_json_error_format() {
24432443
"reason":"compiler-artifact",
24442444
"profile": {
24452445
"debug_assertions": true,
2446-
"debuginfo": true,
2446+
"debuginfo": 2,
24472447
"opt_level": "0",
24482448
"test": false
24492449
},
@@ -2475,7 +2475,7 @@ fn compiler_json_error_format() {
24752475
"target":{"kind":["bin"],"name":"foo","src_path":"[..]main.rs"},
24762476
"profile": {
24772477
"debug_assertions": true,
2478-
"debuginfo": true,
2478+
"debuginfo": 2,
24792479
"opt_level": "0",
24802480
"test": false
24812481
},
@@ -2537,7 +2537,7 @@ fn message_format_json_forward_stderr() {
25372537
"target":{"kind":["bin"],"name":"foo","src_path":"[..]"},
25382538
"profile":{
25392539
"debug_assertions":true,
2540-
"debuginfo":true,
2540+
"debuginfo":2,
25412541
"opt_level":"0",
25422542
"test":false
25432543
},

‎tests/cross-compile.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ fn linker_and_ar() {
432432
.with_stderr_contains(&format!("\
433433
[COMPILING] foo v0.5.0 ({url})
434434
[RUNNING] `rustc --crate-name foo src[/]foo.rs --crate-type bin \
435-
--emit=dep-info,link -g \
435+
--emit=dep-info,link -C debuginfo=2 \
436436
-C metadata=[..] \
437437
--out-dir {dir}[/]target[/]{target}[/]debug[/]deps \
438438
--target {target} \

‎tests/profiles.rs

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,38 @@ fn opt_level_override_0() {
6262
[COMPILING] test v0.0.0 ({url})
6363
[RUNNING] `rustc --crate-name test src[/]lib.rs --crate-type lib \
6464
--emit=dep-info,link \
65-
-g \
65+
-C debuginfo=2 \
66+
-C metadata=[..] \
67+
--out-dir [..] \
68+
-L dependency={dir}[/]target[/]debug[/]deps`
69+
[FINISHED] [..] target(s) in [..]
70+
",
71+
dir = p.root().display(),
72+
url = p.url()
73+
)));
74+
}
75+
76+
#[test]
77+
fn debug_override_1() {
78+
let mut p = project("foo");
79+
80+
p = p
81+
.file("Cargo.toml", r#"
82+
[package]
83+
name = "test"
84+
version = "0.0.0"
85+
authors = []
86+
87+
[profile.dev]
88+
debug = 1
89+
"#)
90+
.file("src/lib.rs", "");
91+
assert_that(p.cargo_process("build").arg("-v"),
92+
execs().with_status(0).with_stderr(&format!("\
93+
[COMPILING] test v0.0.0 ({url})
94+
[RUNNING] `rustc --crate-name test src[/]lib.rs --crate-type lib \
95+
--emit=dep-info,link \
96+
-C debuginfo=1 \
6697
-C metadata=[..] \
6798
--out-dir [..] \
6899
-L dependency={dir}[/]target[/]debug[/]deps`
@@ -93,7 +124,7 @@ fn check_opt_level_override(profile_level: &str, rustc_level: &str) {
93124
[RUNNING] `rustc --crate-name test src[/]lib.rs --crate-type lib \
94125
--emit=dep-info,link \
95126
-C opt-level={level} \
96-
-g \
127+
-C debuginfo=2 \
97128
-C debug-assertions=on \
98129
-C metadata=[..] \
99130
--out-dir [..] \
@@ -164,15 +195,15 @@ fn top_level_overrides_deps() {
164195
--emit=dep-info,link \
165196
-C prefer-dynamic \
166197
-C opt-level=1 \
167-
-g \
198+
-C debuginfo=2 \
168199
-C metadata=[..] \
169200
--out-dir {dir}[/]target[/]release[/]deps \
170201
-L dependency={dir}[/]target[/]release[/]deps`
171202
[COMPILING] test v0.0.0 ({url})
172203
[RUNNING] `rustc --crate-name test src[/]lib.rs --crate-type lib \
173204
--emit=dep-info,link \
174205
-C opt-level=1 \
175-
-g \
206+
-C debuginfo=2 \
176207
-C metadata=[..] \
177208
--out-dir [..] \
178209
-L dependency={dir}[/]target[/]release[/]deps \

‎tests/run.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,14 +446,14 @@ fast2"));
446446
[COMPILING] bar v0.0.1 ({url}/bar)
447447
[RUNNING] `rustc --crate-name bar bar[/]src[/]bar.rs --crate-type lib \
448448
--emit=dep-info,link \
449-
-g \
449+
-C debuginfo=2 \
450450
-C metadata=[..] \
451451
--out-dir {dir}[/]target[/]debug[/]deps \
452452
-L dependency={dir}[/]target[/]debug[/]deps`
453453
[COMPILING] foo v0.0.1 ({url})
454454
[RUNNING] `rustc --crate-name a examples[/]a.rs --crate-type bin \
455455
--emit=dep-info,link \
456-
-g \
456+
-C debuginfo=2 \
457457
-C metadata=[..] \
458458
--out-dir {dir}[/]target[/]debug[/]examples \
459459
-L dependency={dir}[/]target[/]debug[/]deps \

0 commit comments

Comments
 (0)