Add rustc guide to toolstate

[andrehjr]

Closes#59597

[rust-highfive]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

[mark-i-m]

r? @kennytm who (I think) has been keeping track of this?

[mark-i-m]

Hmm it looks like libssl-dev is not installed on the Linux build machines. You might need to edit the .travis.yml file to make sure it is installed as a dependency of the build.

[andrehjr]

I'll take a look into that!

[mark-i-m]

Hmm... you might need to install both libssl and libssl-dev?

[andrehjr]

It seems to me, that libssl-dev and stuff are already installed on the linux machine.. but somehow pkg-config is not being able to pick it up on that part of the build process.. I could try something like you can set the OPENSSL_DIR environment variable for the compilation process. but it seems too much 🤔

[mark-i-m]

@sfackler Do you know what might be causing this?

[sfackler]

Doesn't the build run in the docker image? Installing things on the Travis host isn't going to work in that case.

[andrehjr]

That's true, the build runs into the docker image. I added the required deps onto the image and the build finally finished with success now! Thanks! ✨

@mark-i-m what are the next steps?

[mark-i-m]

@andrehjr Nice work! I left a few comments below, but overall it looks good to me.

The next steps would be to un-WIP the title and wait for a review from somebody with bors permissions (I only have permissions on the rustc-guide repo). This should happen relatively soon. At that point, bors will test and merge PR, and that's it!

[mark-i-m]

Sorry, I missed one last thing. Other than that I think this is ready 🎉

[andrehjr]

Awesome! @mark-i-m Thanks so much for guiding me through this PR 🎉 🎉

[mark-i-m]

My pleasure :) Thanks for contributing.

[bors]

☔ The latest upstream changes (presumably #59515) made this pull request unmergeable. Please resolve the merge conflicts.

[andrehjr]

Cool, I tested on macos @mark-i-m ! Looks like it's a success now!

 Compiling rustbook v0.1.0 (/Users/andrehjr/work/rust/src/tools/rustbook)
Finished release [optimized] target(s) in 3.59s
Error: mdbook-linkcheck only works on x86_64 linux targets.
command did not execute successfully: "/Users/andrehjr/work/rust/build/x86_64-apple-darwin/stage0-tools-bin/rustbook" "linkcheck" "/Users/andrehjr/work/rust/src/doc/rustc-guide"
expected success, got: exit code: 101
failed to run: /Users/andrehjr/work/rust/build/bootstrap/debug/bootstrap test src/doc/rustc-guide
Build completed unsuccessfully in 0:00:05

[mark-i-m]

Hmm.... actually, I think it was a mistake to return an error. That will cause it to fail the build. @andrehjr Could you please change the bail to a println?

[andrehjr]

That makes sense @mark-i-m ! I pushed a fix 🚀

[mark-i-m]

@bors r+

[bors]

📌 Commit b6ef09151ae67063857918f16c849d819fd82518 has been approved by mark-i-m

[bors]

⌛ Testing commit b6ef09151ae67063857918f16c849d819fd82518 with merge f2e2c4ac0b1099832613b88e1cc95abf7beb17f0...

[Centril]

@bors retry yielding to r0llup

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout add-rustc-guide-to-toolstate(switch to your branch)
2. git fetch upstream master(retrieve the latest master)
3. git rebase upstream/master -p(rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self add-rustc-guide-to-toolstate --force-with-lease(update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

[mark-i-m]

@Centril I understand the importance of the rollups, but could you avoid preempting running builds of PRs with 100s of comments please?

@bors r+

[bors]

📌 Commit b5cd962 has been approved by mark-i-m

[Centril]

@mark-i-m

@Centril I understand the importance of the rollups, but could you avoid preempting running builds of PRs [...]?

Sorry, but no. Maintaining high PR throughput and low latency (a shorter queue) is the 1. priority when managing the bors queue, especially after last week's CI problems after which we had a huge number of PRs in the queue. When one of my rollups fail due to some PR in it or some spurious failure I won't let other PRs leap ahead while I remake the rollup unless there is some special circumstance.

[...] with 100s of comments please?

What's the relevance of 100s of comments?

[mark-i-m]

@Centril the significance is that a disproportionately high amount of work and waiting has gone into this PR.

Moreover, it seems like every time the PR is approved, it incurs a merge conflict; it's been rebased at least 5 times in the last two weeks. It's just a bit frustrating when such a PR finally makes it to the head of the queue... and is preempted...

[bors]

⌛ Testing commit b5cd962 with merge dfd52ba...

[Centril]

@Centril the significance is that a disproportionately high amount of work and waiting has gone into this PR.

The queue system works such that older PRs automatically get ahead in the queue. The PR has also tested 4 times and failed. To me this means that this PR has been treated fairly by the queue.

Moreover, it seems like every time the PR is approved, it incurs a merge conflict; it's been rebased at least 5 times in the last two weeks.

When the queue size is large it contributes towards having to rebase more times but if some PR is especially bitrotty you should raise the priority and write a comment saying it is bitrotty. In this case rebases were necessary due to lockfiles which are updated primarily outside of rollups by PRs that jump the queue with p=1.

It's just a bit frustrating when such a PR finally makes it to the head of the queue... and is preempted...

First, a PR has a better chance of being tested if the queue is small and this is achieved through rollups. Second, it is equally frustrating to baby sit rollups, have them fail, and then be preempted by a PR that just got added to the queue. The alternative would be to treeclose while doing rollup ops but that doesn't seem to work so well.

[bors]

☀️ Test successful - checks-azure, checks-travis, status-appveyor
Approved by: mark-i-m
Pushing dfd52ba to master...