Skip to content

Commit 3f0fb36

Browse files
authored
Rollup merge of #128266 - onur-ozkan:update-channel-doc, r=dtolnay
update `rust.channel` default value documentation self-explanatory Resolves #128258 r? dtolnay
2 parents 8460ed6 + 139a713 commit 3f0fb36

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

config.example.toml

+4-1
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,10 @@
578578
# The "channel" for the Rust build to produce. The stable/beta channels only
579579
# allow using stable features, whereas the nightly and dev channels allow using
580580
# nightly features
581-
#channel = "dev"
581+
#
582+
# If using tarball sources, default value for `channel` is taken from the `src/ci/channel` file;
583+
# otherwise, it's "dev".
584+
#channel = if "is a tarball source" { content of `src/ci/channel` file } else { "dev" }
582585

583586
# A descriptive string to be appended to `rustc --version` output, which is
584587
# also used in places like debuginfo `DW_AT_producer`. This may be useful for

src/bootstrap/src/utils/change_tracker.rs

+5
Original file line numberDiff line numberDiff line change
@@ -215,4 +215,9 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[
215215
severity: ChangeSeverity::Info,
216216
summary: "Removed android-ndk r25b support in favor of android-ndk r26d.",
217217
},
218+
ChangeInfo {
219+
change_id: 125181,
220+
severity: ChangeSeverity::Warning,
221+
summary: "For tarball sources, default value for `rust.channel` will be taken from `src/ci/channel` file.",
222+
},
218223
];

0 commit comments

Comments
 (0)