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 35 pull requests #40420

Closed
wants to merge 116 commits into from
Closed

Conversation

alexcrichton
Copy link
Member

sinkuu and others added 30 commits February 25, 2017 22:11
Fixes rendering of the end of the `Configure and Make` section.
This allows limiting the number of linker jobs to avoid swapping when
linking LLVM with debug info.
Keeps MIR cleaner, `StorageLive(_: !)` makes no sense anyway.
gdb will now reliably detect the lanugage as rust even before any
code is run.
Adds `get`/`get_mut` accessors and `drain`/`drain_enumerated` iterators
to IndexVec.

Implements TypeFoldable for IndexVec.
Fairly basic implementation of inlining for MIR. Uses conservative
heuristics for inlining.
I can't find anything that'd cause unexpected EOF in the source, so let's try
taking a look at the error logs on failures.
This causes problems when first cloning and bootstrapping the repository
unfortunately, so let's ensure that Cargo sticks around in its own workspace.
Because Cargo is a submodule it's not available by default on the inital clone
of the rust-lang/rust repository. Normally it's the responsibility of the
rustbuild to take care of this, but unfortunately to build rustbuild itself we
need to resolve the workspace conflicts.

To deal with this we'll just have to ensure that all submodules are in their own
workspace, which sort of makes sense anyway as updates to dependencies as
bugfixes to Cargo should go to rust-lang/cargo instead of rust-lang/rust. In any
case this commit removes Cargo from the global workspace which should resolve
the issues that we've been seeing.

To actually perform this the `cargo` submodule has been moved to the top
directory to ensure it's outside the scope of `src/Cargo.toml` as a workspace.
@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 10, 2017

📌 Commit d269f8d has been approved by alexcrichton

@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 10, 2017

📌 Commit 5be9027 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Mar 10, 2017

⌛ Testing commit 5be9027 with merge 2607239...

@bors
Copy link
Contributor

bors commented Mar 10, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 10, 2017

📌 Commit d854915 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Mar 10, 2017

⌛ Testing commit d854915 with merge 4a77ed5...

This brings back playpen integration for the books.
@bors
Copy link
Contributor

bors commented Mar 10, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member Author

actual error

investigating...

@arielb1
Copy link
Contributor

arielb1 commented Mar 10, 2017

That's presumably the GDB PR.

@alexcrichton
Copy link
Member Author

@arielb1 you think #40400?

It doesn't seem to touch this test though?

@alexcrichton
Copy link
Member Author

I was thinking https://github.com/rust-lang/rust/pull/40220/files as it touches macros, but I'm not sure. The full test suite passed at one point on Windows/mac/linux so it may also be i686-musl specific, but that seems far fetched.

I'm verifying those latter two claims locally.

@alexcrichton
Copy link
Member Author

Closing in favor of a more conservative version

@alexcrichton alexcrichton deleted the rollup branch March 10, 2017 21:11
@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.