forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#85838 - GuillaumeGomez:rollup-rk2rh7m, r=Guil…
…laumeGomez Rollup of 8 pull requests Successful merges: - rust-lang#85285 (Add eslint checks to CI) - rust-lang#85709 (Use correct edition when parsing `:pat` matchers) - rust-lang#85762 (Do not try to build LLVM with Zlib on Windows) - rust-lang#85770 (Remove `--print unversioned-files` from rustdoc ) - rust-lang#85781 (Add documentation for aarch64-apple-ios-sim target) - rust-lang#85801 (Add `String::extend_from_within`) - rust-lang#85817 (Fix a typo) - rust-lang#85818 (Don't drop `PResult` without handling the error) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
- Loading branch information
Showing
24 changed files
with
197 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
src/doc/rustc/src/platform-support/aarch64-apple-ios-sim.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
# aarch64-apple-ios-sim | ||
|
||
**Tier: 3** | ||
|
||
Apple iOS Simulator on ARM64. | ||
|
||
## Designated Developers | ||
|
||
* [@badboy](https://github.com/badboy) | ||
* [@deg4uss3r](https://github.com/deg4uss3r) | ||
|
||
## Requirements | ||
|
||
This target is cross-compiled. | ||
To build this target Xcode 12 or higher on macOS is required. | ||
|
||
## Building | ||
|
||
The target can be built by enabling it for a `rustc` build: | ||
|
||
```toml | ||
[build] | ||
build-stage = 1 | ||
target = ["aarch64-apple-ios-sim"] | ||
``` | ||
|
||
## Cross-compilation | ||
|
||
This target can be cross-compiled from `x86_64` or `aarch64` macOS hosts. | ||
|
||
Other hosts are not supported for cross-compilation, but might work when also providing the required Xcode SDK. | ||
|
||
## Testing | ||
|
||
Currently there is no support to run the rustc test suite for this target. | ||
|
||
|
||
## Building Rust programs | ||
|
||
*Note: Building for this target requires the corresponding iOS SDK, as provided by Xcode 12+.* | ||
|
||
If `rustc` has support for that target and the library artifacts are available, | ||
then Rust programs can be built for that target: | ||
|
||
```text | ||
rustc --target aarch64-apple-ios-sim your-code.rs | ||
``` | ||
|
||
On Rust Nightly it is possible to build without the target artifacts available: | ||
|
||
```text | ||
cargo build -Z build-std --target aarch64-apple-ios-sim | ||
``` | ||
|
||
There is no easy way to run simple programs in the iOS simulator. | ||
Static library builds can be embedded into iOS applications. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
/* global initSidebarItems */ | ||
initSidebarItems({}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
18 changes: 0 additions & 18 deletions
18
src/test/run-make-fulldeps/print-unversioned-files/unversioned-files.txt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
// edition:2018 | ||
|
||
#[macro_export] | ||
macro_rules! custom_matches { | ||
($expression:expr, $( $pattern:pat )|+ $( if $guard: expr )? $(,)?) => { | ||
match $expression { | ||
$( $pattern )|+ $( if $guard )? => true, | ||
_ => false | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
// edition:2021 | ||
// check-pass | ||
// aux-build: foreign-crate-macro-pat.rs | ||
// | ||
// Tests that the edition of the foreign crate is used | ||
// when determining the behavior of the `:pat` matcher. | ||
|
||
extern crate foreign_crate_macro_pat; | ||
|
||
fn main() { | ||
let _b = foreign_crate_macro_pat::custom_matches!(b'3', b'0' ..= b'9'); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
// edition:2021 | ||
// check-pass | ||
// | ||
// Regression test for issue #84429 | ||
// Tests that we can properly invoke `matches!` from a 2021-edition crate. | ||
|
||
fn main() { | ||
let _b = matches!(b'3', b'0' ..= b'9'); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
// Regression test for #85794 | ||
|
||
struct Baz { | ||
inner : dyn fn () | ||
//~^ ERROR expected `,`, or `}`, found keyword `fn` | ||
//~| ERROR functions are not allowed in struct definitions | ||
//~| ERROR cannot find type `dyn` in this scope | ||
} | ||
|
||
fn main() {} |
Oops, something went wrong.