diff options
| author | bors <bors@rust-lang.org> | 2022-09-07 21:17:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-07 21:17:30 +0000 |
| commit | c2804e6ec2c29a5c7368600ea173b890e2655c3d (patch) | |
| tree | 466a4e69430b3932571c803fe46577f55d94546b /src/doc | |
| parent | 9682b5d3a34b3167d7f2f2d0cf6ddc485cd51b4b (diff) | |
| parent | eae48c31cb79f74f68aab6e59e28be55a89092c3 (diff) | |
| download | rust-c2804e6ec2c29a5c7368600ea173b890e2655c3d.tar.gz rust-c2804e6ec2c29a5c7368600ea173b890e2655c3d.zip | |
Auto merge of #101544 - matthiaskrgr:rollup-4urx917, r=matthiaskrgr
Rollup of 14 pull requests
Successful merges:
- #101343 (Add -api-level to pm command)
- #101416 (stdio: Document no support for writing to non-blocking stdio/stderr)
- #101435 (Remove unnecessary `EMIT_MIR_FOR_EACH_BITWIDTH`)
- #101493 (Pass ImplTraitContext as &mut to avoid the need of ImplTraitContext::reborrow)
- #101502 (Do not suggest a semicolon for a macro without `!`)
- #101503 (Add debug calls)
- #101506 (rustdoc: remove unused CSS `#main-content > .since`)
- #101507 (rustdoc: remove unused CSS `#main-content > table td`)
- #101521 (Rustdoc-Json: More accurate struct type.)
- #101525 (Fix typo in pass_manager.rs)
- #101534 (rustdoc: remove unused mobile CSS `.rustdoc { flex-direction }`)
- #101535 (Fix error printing mistake in tidy)
- #101536 (Add documentation for Attr::is_doc_comment)
- #101538 (rustdoc: remove unused CSS `.content .methods > div`)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/doc')
| -rw-r--r-- | src/doc/rustc/src/platform-support/fuchsia.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/doc/rustc/src/platform-support/fuchsia.md b/src/doc/rustc/src/platform-support/fuchsia.md index 3c9eecbe128..1d5ad3cce18 100644 --- a/src/doc/rustc/src/platform-support/fuchsia.md +++ b/src/doc/rustc/src/platform-support/fuchsia.md @@ -422,6 +422,7 @@ Next, we'll build a package manifest as defined by our manifest: ```sh ${SDK_PATH}/tools/${ARCH}/pm \ + -api-level $(${SDK_PATH}/tools/${ARCH}/ffx version -v | grep "api-level" | head -1 | awk -F ' ' '{print $2}') \ -o pkg/hello_fuchsia_manifest \ -m pkg/hello_fuchsia.manifest \ build \ |