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 15 pull requests #37002

Merged
merged 42 commits into from
Oct 6, 2016
Merged

Rollup of 15 pull requests #37002

merged 42 commits into from
Oct 6, 2016

Conversation

cbreeden and others added 30 commits September 25, 2016 16:24
There were a few places that need extra indentation to register as a code block.
`impl<T> *mut T` is currently missing from
https://doc.rust-lang.org/nightly/std/primitive.pointer.html and this adds
it back.
In rust-lang#36292, support was added to target musl libc for ARM targets using
rustbuild. Specifically, that change allowed the addition of per-target
"musl-root" options in the rustbuild config.toml so that multiple
targets depending on musl could be built. However, that implementation
contained a couple of omissions: the musl-root option was added to the
config, but was never added to the TOML parsing, and therefore was not
actually being loaded from config.toml. This commit rectifies that and
allows successful building of musl-based ARM targets.
The previous panic message delivered when a musl target was specified
but musl-root was not specified incorrectly instructed the user to add
the musl-root key to the "build" section of config.toml. The key
actually needs to be added to the "rust" section.
cc rust-lang#36920 (in addition to LLVM PR30597, should fix the &&[i32] case)
`BufRead` comments, in the `Seek` trait	implementation,	was talking
about allocating 8 *ebibytes*. It was a	typo, the correct unit is
*exbibytes*, since *ebibytes* don't even exist.	The calculation	is
correct, though.
Touch up formatting for variance README.md

There were a few places that needed extra indentation to register as a code block.
Add testcase for issue-32948

issue-32948 is similar to issue-32554.

issue-32948 : Symbol names for monomorphized trait impls are not stable across crates
issue-32554 : Symbol names for generics are not stable across crates

so, I append issue-32948's testcase to issue-32554's testcase.
thanks!
Jonathan Turner added 12 commits October 6, 2016 08:35
Clarify last element in str.{r,}splitn documentation

An attempt at rust-lang#36202.

I'm not sure if my wording is actually clearer, to be honest...
…ph-test, r=nikomatsakis

incr.comp.: Add test case for dependency graph of type aliases.

r? @nikomatsakis
Minor modifications in concurrency section of the Rust book

Fixes rust-lang#36939
r? @steveklabnik
fix pred_count accounting in SimplifyCfg

r? @eddyb
… r=eddyb

Linker regression

This should fix the symbol conflicts reported in rust-lang#36852.
The PR also makes some debug output a bit more informative.

r? @eddyb
Emit more assumptions in trans

Perf numbers pending.
…xcrichton

rustdoc: Fix missing *mut T impl

`impl<T> *mut T` is currently missing from
https://doc.rust-lang.org/nightly/std/primitive.pointer.html and this adds
it back.
update sip.rs for new intrinsics and defaults
…musl-root, r=alexcrichton

Fix rustbuild per-target musl root

In rust-lang#36292, support was added to target musl libc for ARM targets using rustbuild. Specifically, that change allowed the addition of per-target `musl-root` options in the rustbuild `config.toml` so that multiple targets depending on musl could be built. However, that implementation contained a couple of omissions: the `musl-root` option was added to the config, but was never added to the TOML parsing, and therefore was not actually being loaded from `config.toml`. This PR rectifies that.

Using these changes and a heavily modified version of the buildbot Docker container, I have been able to build rust targeting `armv7-unknown-linux-musleabihf` and have successfully run the binaries on a Raspberry Pi 3. I'm also planning to test `arm-unknown-linux-musleabi` and `arm-unknown-linux-musleabihf` systems, but have no reason to believe that this change would not simply work on those targets.
…Interfaces, r=michaelwoerister

Mb/36812 ich function interfaces

r? @michaelwoerister

This PR contains fixes for rust-lang#36812 and rust-lang#36914
…richton

Fixed small typo in `BufRead` comments

`BufRead` comments, in the `Seek` trait	implementation, was talking about allocating 8 *ebibytes*. It was a typo, the correct unit is *exbibytes*, since *ebibytes* don't even exist.	The calculation is correct, though.
@sophiajt
Copy link
Contributor Author

sophiajt commented Oct 6, 2016

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Oct 6, 2016

📌 Commit 89aebdb has been approved by jonathandturner

@rust-highfive
Copy link
Collaborator

r? @Aatch

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

@bors
Copy link
Contributor

bors commented Oct 6, 2016

⌛ Testing commit 89aebdb with merge 8a54078...

@alexcrichton
Copy link
Member

@bors: retry force clean

  • restarted buildbot

@bors
Copy link
Contributor

bors commented Oct 6, 2016

⌛ Testing commit 89aebdb with merge 82604f2...

@alexcrichton
Copy link
Member

@bors: retry force clean

  • another restart...

@bors
Copy link
Contributor

bors commented Oct 6, 2016

⌛ Testing commit 89aebdb with merge ad19c32...

bors added a commit that referenced this pull request Oct 6, 2016
@bors bors merged commit 89aebdb into rust-lang:master Oct 6, 2016
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 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.