Skip to content

Commit 8fa389b

Browse files
committed
Auto merge of #148202 - Zalathar:rollup-2eriuc3, r=Zalathar
Rollup of 14 pull requests Successful merges: - rust-lang/rust#144936 (CFI: Fix types that implement Fn, FnMut, or FnOnce) - rust-lang/rust#147185 (repr(transparent): do not consider repr(C) types to be 1-ZST) - rust-lang/rust#147840 (Rework unsizing coercions in the new solver) - rust-lang/rust#147915 (Update target maintainers android.md) - rust-lang/rust#148013 (1.91.0 release notes) - rust-lang/rust#148044 (compiletest: show output in debug logging) - rust-lang/rust#148057 (tests/ui/sanitizer/hwaddress.rs: Run on aarch64 and remove cgu hack) - rust-lang/rust#148139 (Add `coverage` scope for controlling paths in code coverage) - rust-lang/rust#148154 (Add a mailmap entry) - rust-lang/rust#148158 (ci: loongarch64: use medium code model to avoid relocation overflows) - rust-lang/rust#148166 (Re-enable macro-stepping test for AArch64) - rust-lang/rust#148172 (rustc-dev-guide subtree update) - rust-lang/rust#148175 (Fix typos: duplicate words in comments) - rust-lang/rust#148186 (rustdoc-search: add an integration test for CCI) Failed merges: - rust-lang/rust#147935 (Add LLVM realtime sanitizer) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 58f61f1 + b074406 commit 8fa389b

File tree

5 files changed

+33
-11
lines changed

5 files changed

+33
-11
lines changed

rust-version

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

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/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/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

src/rustdoc-internals/search.md

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,4 +521,25 @@ const EXPECTED = [
521521
returned: [],
522522
},
523523
]
524-
```
524+
```
525+
526+
If the [`//@ revisions`] directive is used, the JS file will
527+
have access to a variable called `REVISION`.
528+
529+
```js
530+
const EXPECTED = [
531+
// This first test targets name-based search.
532+
{
533+
query: "constructor",
534+
others: REVISION === "has_constructor" ?
535+
[
536+
{ path: "constructor_search", name: "constructor" },
537+
] :
538+
[],
539+
in_args: [],
540+
returned: [],
541+
},
542+
];
543+
```
544+
545+
[`//@ revisions`]: ../tests/compiletest.md#revisions

0 commit comments

Comments
 (0)