From 39628ff5a42d14afc75f57dedcc430c043468836 Mon Sep 17 00:00:00 2001 From: Tshepang Mbambo Date: Mon, 8 Sep 2025 06:12:51 +0200 Subject: [PATCH 1/7] remove untrue/contentious statement One can use unstable features on stable too, like via an env var --- src/doc/rustc-dev-guide/src/contributing.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/doc/rustc-dev-guide/src/contributing.md b/src/doc/rustc-dev-guide/src/contributing.md index 347608d305aa9..764452b6e5442 100644 --- a/src/doc/rustc-dev-guide/src/contributing.md +++ b/src/doc/rustc-dev-guide/src/contributing.md @@ -52,9 +52,7 @@ channels: stable, beta, and nightly. - **Stable**: this is the latest stable release for general usage. - **Beta**: this is the next release (will be stable within 6 weeks). -- **Nightly**: follows the `master` branch of the repo. This is the only - channel where unstable, incomplete, or experimental features are usable with - feature gates. +- **Nightly**: follows the `master` branch of the repo. See [this chapter on implementing new features](./implementing_new_features.md) for more information. From 1eb80f1d3c9cd30dcba45f4c6b3e49a1a7b50b50 Mon Sep 17 00:00:00 2001 From: Tshepang Mbambo Date: Sat, 4 Oct 2025 21:10:24 +0200 Subject: [PATCH 2/7] restore helpful explanation --- src/doc/rustc-dev-guide/src/contributing.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/doc/rustc-dev-guide/src/contributing.md b/src/doc/rustc-dev-guide/src/contributing.md index 764452b6e5442..b927c9a792745 100644 --- a/src/doc/rustc-dev-guide/src/contributing.md +++ b/src/doc/rustc-dev-guide/src/contributing.md @@ -53,6 +53,8 @@ channels: stable, beta, and nightly. - **Stable**: this is the latest stable release for general usage. - **Beta**: this is the next release (will be stable within 6 weeks). - **Nightly**: follows the `master` branch of the repo. + This is the only channel where unstable, incomplete, or experimental features + should be used (with feature gates). See [this chapter on implementing new features](./implementing_new_features.md) for more information. From 5765a82f479bc90d5247215887dda85a9ef14820 Mon Sep 17 00:00:00 2001 From: The rustc-josh-sync Cronjob Bot Date: Mon, 20 Oct 2025 20:58:30 +0000 Subject: [PATCH 3/7] Prepare for merging from rust-lang/rust This updates the rust-version file to 4068bafedd8ba724e332a5221c06a6fa531a30d2. --- src/doc/rustc-dev-guide/rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doc/rustc-dev-guide/rust-version b/src/doc/rustc-dev-guide/rust-version index 47552aee08f74..a7367c5c88262 100644 --- a/src/doc/rustc-dev-guide/rust-version +++ b/src/doc/rustc-dev-guide/rust-version @@ -1 +1 @@ -4fa824bb78318a3cba8c7339d5754b4909922547 +4068bafedd8ba724e332a5221c06a6fa531a30d2 From b0545d660918bce6644cde3273cc78730d62a638 Mon Sep 17 00:00:00 2001 From: Tshepang Mbambo Date: Mon, 20 Oct 2025 23:08:28 +0200 Subject: [PATCH 4/7] how-to-build-and-run.md: remove stray instructions the previous command already builds using in-tree std --- .../rustc-dev-guide/src/building/how-to-build-and-run.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/doc/rustc-dev-guide/src/building/how-to-build-and-run.md b/src/doc/rustc-dev-guide/src/building/how-to-build-and-run.md index ace834a55b71f..efb21726e3c6a 100644 --- a/src/doc/rustc-dev-guide/src/building/how-to-build-and-run.md +++ b/src/doc/rustc-dev-guide/src/building/how-to-build-and-run.md @@ -235,12 +235,6 @@ What this command does is: - Build `library` (the standard libraries) with the stage1 compiler that was just built. - Assemble a working stage1 sysroot, containing the stage1 compiler and stage1 standard libraries. -To build `rustc` with the in-tree `std`, use this command instead: - -```console -./x build library --stage 2 -``` - This final product (stage1 compiler + libs built using that compiler) is what you need to build other Rust programs (unless you use `#![no_std]` or `#![no_core]`). From 8badb14d822b724ab4e63c9b32ff37481204b628 Mon Sep 17 00:00:00 2001 From: Manuel Drehwald Date: Fri, 24 Oct 2025 03:09:24 +0200 Subject: [PATCH 5/7] Add the gpu version of the kernel which was missing in the docs --- src/doc/rustc-dev-guide/src/offload/usage.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/doc/rustc-dev-guide/src/offload/usage.md b/src/doc/rustc-dev-guide/src/offload/usage.md index 9f519984d9bcc..7d1a5c9e2e0ed 100644 --- a/src/doc/rustc-dev-guide/src/offload/usage.md +++ b/src/doc/rustc-dev-guide/src/offload/usage.md @@ -56,6 +56,13 @@ fn main() { unsafe extern "C" { pub fn kernel_1(array_b: *mut [f64; 256]); } + +#[cfg(not(target_os = "linux"))] +#[unsafe(no_mangle)] +#[inline(never)] +pub extern "gpu-kernel" fn kernel_1(x: *mut [f64; 256]) { + unsafe { (*x)[0] = 21.0 }; +} ``` ## Compile instructions From b12f71178b101d6423208a28e57816e7220eb831 Mon Sep 17 00:00:00 2001 From: The rustc-josh-sync Cronjob Bot Date: Mon, 27 Oct 2025 04:14:59 +0000 Subject: [PATCH 6/7] Prepare for merging from rust-lang/rust This updates the rust-version file to b1b464d6f61ec8c4e609c1328106378c066a9729. --- src/doc/rustc-dev-guide/rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doc/rustc-dev-guide/rust-version b/src/doc/rustc-dev-guide/rust-version index a7367c5c88262..f100e41166860 100644 --- a/src/doc/rustc-dev-guide/rust-version +++ b/src/doc/rustc-dev-guide/rust-version @@ -1 +1 @@ -4068bafedd8ba724e332a5221c06a6fa531a30d2 +b1b464d6f61ec8c4e609c1328106378c066a9729 From 943074fd095f66712eeabb0e53bbc78695be7cd8 Mon Sep 17 00:00:00 2001 From: Tshepang Mbambo Date: Mon, 27 Oct 2025 15:35:18 +0200 Subject: [PATCH 7/7] improve and strengthen wording --- src/doc/rustc-dev-guide/src/contributing.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/doc/rustc-dev-guide/src/contributing.md b/src/doc/rustc-dev-guide/src/contributing.md index b927c9a792745..dbd04c51593cf 100644 --- a/src/doc/rustc-dev-guide/src/contributing.md +++ b/src/doc/rustc-dev-guide/src/contributing.md @@ -53,8 +53,8 @@ channels: stable, beta, and nightly. - **Stable**: this is the latest stable release for general usage. - **Beta**: this is the next release (will be stable within 6 weeks). - **Nightly**: follows the `master` branch of the repo. - This is the only channel where unstable, incomplete, or experimental features - should be used (with feature gates). + This is the only channel where unstable features are intended to be used, + which happens via opt-in feature gates. See [this chapter on implementing new features](./implementing_new_features.md) for more information.