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 11 pull requests #42094

Closed
wants to merge 27 commits into from

Conversation

japaric and others added 27 commits May 13, 2017 09:26
This commit adds two unstable flags to `rustc`: `-Z pre-link-arg` and `-Z
pre-link-args`. These are the counterpart of the existing `-C link-arg{,s}`
flags and can be used to pass extra arguments at the *beginning* of the linker
invocation, before the Rust object files are passed.
This PR does two things:
* Triggers an error on GNU/Linux & Android when /proc/self/exe doesn't exist
* Handle the error properly
Introduce a new Installer object that hold a reference to all the
configured paths for installation

Signed-off-by: Marc-Antoine Perennou <[email protected]>
ci: allows files to be shared by docker images

Change `src/ci/docker/run.sh` to allow files to be shared when building docker containers. For while, only android related shell scripts are shared. Others containers can be updated at any time.

sccache is installed last, as it is frequently updated this avoids the need to rebuilt the whole container.
add -Z pre-link-arg{,s} to rustc

This PR adds two unstable flags to `rustc`: `-Z pre-link-arg` and `-Z
pre-link-args`. These are the counterpart of the existing `-C link-arg{,s}`
flags and can be used to pass extra arguments at the *beginning* of the linker
invocation, before the Rust object files are passed.

I have [started] a discussion on the rust-embedded RFCs repo about settling on a
convention for passing extra arguments to the linker and there are two options
on discussion: `.cargo/config`'s `target.$T.rustflags` and custom target
specification files (`{pre,,post}-link-args` fields). However, to compare these
two options on equal footing this `-Z pre-link-arg` feature is required.

[started]: rust-embedded/wg#24

Therefore I'm requesting landing this `-Z pre-link-arg` flag as an experimental
feature to evaluate these two options.

cc @brson
r? @alexcrichton
…=nrc

Fix ICE on `include!(line!())` (regression)

Fixes rust-lang#41776.
r? @nrc
…r=steveklabnik

Add documentation for `ExitStatus`

As requested in rust-lang#29370. r? @steveklabnik
Improve the error management when /proc is not mounted

This PR does two things:
* Triggers an error on GNU/Linux & Android when /proc/self/exe doesn't exist
* Handle the error properly
rustbuild: install improvements

Install rust-analysis and rust-src to get in par with what we can get from rustup.
Allow bypassing the vendoring of dependencies. When we only build to install and not to redistribute dist tarballs, that part is not necessary, so avoid trying to install cargo-vendor.
fix typo in libstd/sync/mpsc/mod.rs docs
…hes, r=eddyb

incr. comp.: Use more bits for DefPath hashes

Use 128 instead of 64 bits for DefPath hashes, like we do for everything else. Collision probability is unnecessarily high with 64 bits.

Also change the representation of `ich::Fingerprint` from `Fingerprint([u8; 16])` to `Fingerprint(u64, u64)` which is better for hashers like `FxHasher`.
@rust-highfive
Copy link
Collaborator

Some changes occurred in HTML/CSS.

cc @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

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

@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Contributor

bors commented May 18, 2017

📌 Commit 01a6a9f has been approved by Mark-Simulacrum

@bors
Copy link
Contributor

bors commented May 19, 2017

⌛ Testing commit 01a6a9f with merge e880c89...

@bors
Copy link
Contributor

bors commented May 19, 2017

💔 Test failed - status-travis

@Mark-Simulacrum
Copy link
Member Author

[01:17:00] error: process didn't exit successfully: `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/i686-unknown-linux-musl/release/deps/std-116dfe5a1b0286e7` (signal: 11, SIGSEGV: invalid memory reference)
[01:17:00] 
[01:17:00] To learn more, run the command again with --verbose.
[01:17:00] 
[01:17:00] 
[01:17:00] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "-j" "4" "--target" "i686-unknown-linux-musl" "--release" "--locked" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "--features" "panic-unwind jemalloc backtrace" "-p" "std:0.0.0" "-p" "rustc_msan:0.0.0" "-p" "compiler_builtins:0.0.0" "-p" "alloc_system:0.0.0" "-p" "alloc:0.0.0" "-p" "rustc_tsan:0.0.0" "-p" "std_unicode:0.0.0" "-p" "core:0.0.0" "-p" "unwind:0.0.0" "-p" "rustc_asan:0.0.0" "-p" "collections:0.0.0" "-p" "rustc_lsan:0.0.0" "-p" "rand:0.0.0" "-p" "panic_abort:0.0.0" "-p" "libc:0.0.0" "--"
[01:17:00] expected success, got: exit code: 101
[01:17:00] 
[01:17:00] 
[01:17:00] Build completed unsuccessfully in 1:15:04

musl spurious segfault presumably, #38618

@bors retry

@bors
Copy link
Contributor

bors commented May 19, 2017

⌛ Testing commit 01a6a9f with merge 1eb81fe...

@bors
Copy link
Contributor

bors commented May 19, 2017

💔 Test failed - status-travis

@Mark-Simulacrum Mark-Simulacrum deleted the rollup branch May 19, 2017 11:33
@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.