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 4 pull requests #43980

Closed
wants to merge 11 commits into from
Closed

Rollup of 4 pull requests #43980

wants to merge 11 commits into from

Conversation

frewsxcv and others added 11 commits August 17, 2017 00:36
…=QuietMisdreavus

Minor rewrite of char primitive unicode intro.

Opened primarily to address rust-lang#36998.

Despite my love for emoji, the heart example is a little confusing because both heart characters start with the same code point and there can be stark rendering differences across browsers. I also spelled out what each of the code points is in the code block, which (hopefully) sheds light why one character is one code point while the other is two.

Very much open to suggestion and improvements. I'm pretty tired when I wrote this so I might wake up and realize that this is making things more confusing 😅
Add x86_64-unknown-redox to build manifest target list

This should fix the issue of `x86_64-unknown-redox` not being available for `rustup target add`
@rust-highfive
Copy link
Collaborator

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@aidanhs
Copy link
Member Author

aidanhs commented Aug 18, 2017

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Aug 18, 2017

📌 Commit 92a5cd9 has been approved by aidanhs

@bors
Copy link
Contributor

bors commented Aug 18, 2017

⌛ Testing commit 92a5cd9 with merge 2433156...

bors added a commit that referenced this pull request Aug 18, 2017
Rollup of 4 pull requests

- Successful merges: #43919, #43936, #43950, #43978
- Failed merges:
@bors
Copy link
Contributor

bors commented Aug 19, 2017

💔 Test failed - status-travis

@aidanhs
Copy link
Member Author

aidanhs commented Aug 19, 2017

Merge got stuck by #40672. The PR travis build is a live example of the problem I've sent to travis, so don't close this PR for now (not sure if that will auto-cancel the build).

@kennytm
Copy link
Member

kennytm commented Aug 19, 2017

@aidanhs: Could we retry? Given that 3 of the 4 rolled up PRs are merged, there is no longer need to merge this.

@aidanhs aidanhs closed this Aug 21, 2017
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants