Commit 04f29fd

authored

Rollup merge of #145291 - Zalathar:no-warning, r=Kobzol

bootstrap: Only warn about `rust.debug-assertions` if downloading rustc The changes in #145149 had the unwanted side-effect of causing bootstrap to *always* warn about `rust.debug-assertions = true`, even if rustc isn't going to be downloaded anyway. cc ``@Shourya742`` ``@Kobzol``

2 parents dcc0b6b + e454022 commit 04f29fdCopy full SHA for 04f29fd

File tree

1 file changed

-1

lines changed

src/bootstrap/src/core/config
- config.rs

1 file changed

-1

lines changed

`‎src/bootstrap/src/core/config/config.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -955,7 +955,7 @@ impl Config {`
`955`	`955`	`config.download_rustc_commit =`
`956`	`956`	`download_ci_rustc_commit(dwn_ctx, rust_download_rustc, config.llvm_assertions);`
`957`	`957`
`958`		`- if debug_assertions_requested {`
	`958`	`+ if debug_assertions_requested && config.download_rustc_commit.is_some(){`
`959`	`959`	`eprintln!(`
`960`	`960`	"WARN: `rust.debug-assertions = true` will prevent downloading CI rustc as alt CI \
`961`	`961`	`rustc is not currently built with debug assertions."`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 04f29fd

File tree

1 file changed

1 file changed

`‎src/bootstrap/src/core/config/config.rs‎`

0 commit comments