Skip to content

Commit 8616167

Browse files
authored
Rollup merge of #148172 - tshepang:rdg-sync, r=tshepang
rustc-dev-guide subtree update Subtree update of `rustc-dev-guide` to rust-lang/rustc-dev-guide@b9fb8e9. Created using https://github.com/rust-lang/josh-sync. r? ```@ghost```
2 parents a45371f + 044bc7a commit 8616167

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4fa824bb78318a3cba8c7339d5754b4909922547
1+
b1b464d6f61ec8c4e609c1328106378c066a9729

src/doc/rustc-dev-guide/src/building/how-to-build-and-run.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,12 +235,6 @@ What this command does is:
235235
- Build `library` (the standard libraries) with the stage1 compiler that was just built.
236236
- Assemble a working stage1 sysroot, containing the stage1 compiler and stage1 standard libraries.
237237

238-
To build `rustc` with the in-tree `std`, use this command instead:
239-
240-
```console
241-
./x build library --stage 2
242-
```
243-
244238
This final product (stage1 compiler + libs built using that compiler)
245239
is what you need to build other Rust programs (unless you use `#![no_std]` or
246240
`#![no_core]`).

src/doc/rustc-dev-guide/src/contributing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ channels: stable, beta, and nightly.
5252

5353
- **Stable**: this is the latest stable release for general usage.
5454
- **Beta**: this is the next release (will be stable within 6 weeks).
55-
- **Nightly**: follows the `master` branch of the repo. This is the only
56-
channel where unstable, incomplete, or experimental features are usable with
57-
feature gates.
55+
- **Nightly**: follows the `master` branch of the repo.
56+
This is the only channel where unstable features are intended to be used,
57+
which happens via opt-in feature gates.
5858

5959
See [this chapter on implementing new features](./implementing_new_features.md) for more
6060
information.

src/doc/rustc-dev-guide/src/offload/usage.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@ fn main() {
5656
unsafe extern "C" {
5757
pub fn kernel_1(array_b: *mut [f64; 256]);
5858
}
59+
60+
#[cfg(not(target_os = "linux"))]
61+
#[unsafe(no_mangle)]
62+
#[inline(never)]
63+
pub extern "gpu-kernel" fn kernel_1(x: *mut [f64; 256]) {
64+
unsafe { (*x)[0] = 21.0 };
65+
}
5966
```
6067

6168
## Compile instructions

0 commit comments

Comments
 (0)