Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 13 pull requests #88217

Merged
merged 28 commits into from
Aug 22, 2021
Merged

Rollup of 13 pull requests #88217

merged 28 commits into from
Aug 22, 2021

Conversation

jackh726
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ehuss and others added 28 commits August 15, 2021 10:38
The iOS toolchain can be built on Linux with minor changes. The
compilation will invoke `xcrun` to find the path to the iPhone SDK but
a fake `xcrun` executable can be used.

```
#!/bin/sh
echo "/path/to/sdk"
```

The iOS toolchain can then be built and linked with rustup.

```
$ ./x.py build --stage 2 --host x86_64-unknown-linux-gnu \
  	 --target aarch64-apple-ios
$ rustup toolchain link stage1 build/x86_64-unknown-linux-gnu/stage1
```

It's possible to take this toolchain and compile an iOS executable
with it. This requires the ld64 linker and an iOS SDK. The ld64 linker
can be taken from
[cctools](https://github.com/tpoechtrager/cctools-port). A project's
.cargo/config can then be edited to use the linker for this target.

```
[target.aarch64-apple-ios]
linker = "/path/to/cctools/bin/arm-apple-darwin-ld"
rustflags = [
    "-C",
    """
link-args=
    -F/path/to/sdk/System/Library/Frameworks
    -L/path/to/sdk/usr/lib
    -L/path/to/sdk/usr/lib/system/
    -adhoc_codesign
    """,
]
```
Added a line about new formatting option, `{lib}`, for `cargo
tree` (rust-lang/cargo#9663).
…, r=Mark-Simulacrum

CI: Verify commits in beta & stable are in upstream branches.

Closes rust-lang#74721

I think this does the trick. rust-lang#87597 is an example of it failing as it should.
…imulacrum

Update RELEASES to clarify attribute macro values.

As noted in rust-lang#87681, macros do not work with the `#[path]` attribute.  Since the places where macros *can* be used is very limited, I have changed this to just focus on `#[doc]` which is the only attribute where this is really useful.
…-on-linux, r=Mark-Simulacrum

Allow the iOS toolchain to be built on Linux

The iOS toolchain can be built on Linux with minor changes. The compilation will invoke `xcrun` to find the path to the iPhone SDK but a fake `xcrun` executable can be used.

```
#!/bin/sh
echo "/path/to/sdk"
```

The iOS toolchain can then be built and linked with rustup.

```
$ ./x.py build --stage 2 --host x86_64-unknown-linux-gnu \
  	 --target aarch64-apple-ios
$ rustup toolchain link stage1 build/x86_64-unknown-linux-gnu/stage1
```

It's possible to take this toolchain and compile an iOS executable with it. This requires the ld64 linker and an iOS SDK. The ld64 linker can be taken from [cctools](https://github.com/tpoechtrager/cctools-port). A project's .cargo/config can then be edited to use the linker for this target.

```
[target.aarch64-apple-ios]
linker = "/path/to/cctools/bin/arm-apple-darwin-ld"
rustflags = [
    "-C",
    """
link-args=
    -F/path/to/sdk/System/Library/Frameworks
    -L/path/to/sdk/usr/lib
    -L/path/to/sdk/usr/lib/system/
    -adhoc_codesign
    """,
]
```
…mulacrum

Update release note for 1.55.0.

Added a line about new formatting option, `{lib}`, for `cargo
tree` (rust-lang/cargo#9663).
…ule-test, r=oli-obk

Test that type alias impl trait happens in a submodule

r? `@oli-obk`

Related to rust-lang#86727
… r=oli-obk

We meant to use a trait instead of lifetime here

r? `@oli-obk`

Related to rust-lang#86727
…ple-position, r=oli-obk

test TAIT in different positions

r? `@oli-obk`

Related to rust-lang#86727
…oli-obk

Add TAIT struct test

r? `@oli-obk`

Related to rust-lang#86727
…dyn, r=oli-obk

Use of impl trait in an impl as the value for an associated type in a dyn

r? `@oli-obk`

Related to rust-lang#86727
…it, r=oli-obk

Test use of impl Trait in an impl as the value for an associated type in an impl trait

r? `@oli-obk`

Related to rust-lang#86727
…-obk

Test tait use in a fn type

r? `@oli-obk`

I thought this was going to work but doesn't, quickly checked with Niko and he told me that we ruled this out for now. I'm not exactly sure why and how but here we have a test with a FIXME :)

Related to rust-lang#86727
…e-test, r=oli-obk

Test that incomplete inference for TAITs fail

r? `@oli-obk`

Related to rust-lang#86727
@rustbot rustbot added the rollup A PR which is a rollup label Aug 22, 2021
@jackh726
Copy link
Member Author

@bors r+ rollup=never p=13

@bors
Copy link
Contributor

bors commented Aug 22, 2021

📌 Commit b9b53c8 has been approved by jackh726

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 22, 2021
@bors
Copy link
Contributor

bors commented Aug 22, 2021

⌛ Testing commit b9b53c8 with merge 50731df...

@bors
Copy link
Contributor

bors commented Aug 22, 2021

☀️ Test successful - checks-actions
Approved by: jackh726
Pushing 50731df to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 22, 2021
@bors bors merged commit 50731df into rust-lang:master Aug 22, 2021
@rustbot rustbot added this to the 1.56.0 milestone Aug 22, 2021
@jackh726 jackh726 deleted the rollup-3k74o2m branch August 22, 2021 04:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants