Skip to content

Rollup of 6 pull requests #42254

New issue

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

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

Already on GitHub? # to your account

Closed
wants to merge 16 commits into from

Conversation

Keruspe and others added 16 commits May 22, 2017 22:10
only create source tarball for the Dist subcommand
mark install rule as default for Kind::Install
split install-docs
split install-std
factor out empty_dir handling
split install-cargo
split install-analysis
split install-src
rework install-rustc
properly handle cross-compilation setups for install
use pkgname in install
split plain source tarball generation from rust-src dist
document src-tarball in config.toml.exmaple

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
This should include a fix for rust-lang/cargo#4091 with an updated version of
libgit2.

Closes rust-lang/cargo#4091
rustbuild: don't create a source tarball when installing

This splits Install out of Dist as it is not a full dist anymore, and creates the source tarball only for the Dist command.
This will allow splitting install in a few rules if we want as it's done for other phases.
…eddyb

Remove all instances of fragment_infos and fragment sets

Remove unused fragment structs. This was suggested by @eddyb in IRC: [botbot link](https://botbot.me/mozilla/rustc/2017-05-23/?msg=86016574&page=2).
…tsakis

Updated locked version of libgit2

This should include a fix for rust-lang/cargo#4091 with an updated version of
libgit2.

Closes rust-lang/cargo#4091
Allow variadic functions with cdecl calling convention.

Fixes rust-lang#40244.
…ed-tail, r=eddyb

extend `struct_tail` to operate over closures

Not 100% sure why this got exposed when it wasn't before, but this struct definitely seems wrong.

Fixes rust-lang#42110

r? @eddyb
@rust-highfive
Copy link
Contributor

r? @brson

(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
Collaborator

bors commented May 26, 2017

📌 Commit 50faaac has been approved by Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented May 27, 2017

⌛ Testing commit 50faaac with merge 12ed732...

@bors
Copy link
Collaborator

bors commented May 27, 2017

💔 Test failed - status-appveyor

@Mark-Simulacrum
Copy link
Member Author

@bors retry

  • appveyor just didn't start? Presumably due to their migration to GCE

@bors
Copy link
Collaborator

bors commented May 27, 2017

⌛ Testing commit 50faaac with merge 6349af0...

@bors
Copy link
Collaborator

bors commented May 27, 2017

💔 Test failed - status-travis

@shepmaster shepmaster added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 27, 2017
@alexcrichton
Copy link
Member

Looks like a real failure:

[00:57:20] failures:

[00:57:20] 

[00:57:20] ---- [compile-fail] compile-fail/variadic-ffi.rs stdout ----

[00:57:20] 	

[00:57:20] error: /checkout/src/test/compile-fail/variadic-ffi.rs:11: unexpected "error": '11:1: 13:2: The ABI `"stdcall"` is not supported for the current target [E0570]'

[00:57:20] 

[00:57:20] error: 1 unexpected errors found, 0 expected errors not found

[00:57:20] status: exit code: 101

[00:57:20] command: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc /checkout/src/test/compile-fail/variadic-ffi.rs -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/compile-fail --target=arm-unknown-linux-gnueabihf --error-format json -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/compile-fail/variadic-ffi.stage2-arm-unknown-linux-gnueabihf.compile-fail.libaux -C prefer-dynamic -o /checkout/obj/build/x86_64-unknown-linux-gnu/test/compile-fail/variadic-ffi.stage2-arm-unknown-linux-gnueabihf -Clinker=arm-linux-gnueabihf-gcc -Crpath -O -Lnative=/checkout/obj/build/arm-unknown-linux-gnueabihf/native/rust-test-helpers

[00:57:20] unexpected errors (from JSON output): [

[00:57:20]     Error {

[00:57:20]         line_num: 11,

[00:57:20]         kind: Some(

[00:57:20]             Error

[00:57:20]         ),

[00:57:20]         msg: "11:1: 13:2: The ABI `\"stdcall\"` is not supported for the current target [E0570]"

[00:57:20]     }

[00:57:20] ]

[00:57:20] 

[00:57:20] thread '[compile-fail] compile-fail/variadic-ffi.rs' panicked at 'explicit panic', /checkout/src/tools/compiletest/src/runtest.rs:1129

[00:57:20] 

[00:57:20] 

[00:57:20] failures:

[00:57:20]     [compile-fail] compile-fail/variadic-ffi.rs

[00:57:20] 

[00:57:20] test result: FAILED. 2643 passed; 1 failed; 16 ignored; 0 measured; 0 filtered out

@Mark-Simulacrum
Copy link
Member Author

Yeah, this is my PR... closing. I'll fix later.

@Mark-Simulacrum Mark-Simulacrum deleted the rollup branch May 27, 2017 03:10
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
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.