Fix how paths are printed by error messages during bootstrap

[wesleywiser]

Fixes #47355

[rust-highfive]

r? @aturon

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

[pnkfelix]

Looks to me like this is exactly what @alexcrichton called for in this comment; great!

Thanks!

[pnkfelix]

@bors r+

[bors]

📌 Commit 4005430 has been approved by pnkfelix

[bors]

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

[wesleywiser]

Rebased.

[alexcrichton]

@bors: r=pnkfelix

[bors]

📌 Commit c6faac4 has been approved by pnkfelix

[ollie27]

I'm pretty sure

rust/src/bootstrap/dist.rs

Lines 753 to 755 in 9fd7da9

	let src_files = [
	"src/Cargo.lock",
	];

will need to be updated. Also Cargo.toml and Cargo.lock will need to be added to

rust/src/bootstrap/dist.rs

Lines 848 to 858 in 9fd7da9

	let src_files = [
	"COPYRIGHT",
	"LICENSE-APACHE",
	"LICENSE-MIT",
	"CONTRIBUTING.md",
	"README.md",
	"RELEASES.md",
	"configure",
	"x.py",
	"config.toml.example",
	];

.

[bors]

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

[shepmaster]

Ping from triage, @wesleywiser! You have merge conflicts that need to be addressed!

[BatmanAoD]

@wesleywiser Ping from triage; just wanted to let you know that in two days this PR will be closed for inactivity, unless you respond to the request to resolve merge conflicts.

Note that this isn't necessarily a dead end; you will of course be free to reopen once you've resolved the conflicts.

[wesleywiser]

Thanks @shepmaster and @BatmanAoD! I'm getting back from some vacation time and still trying to dig through my inbox. I'll have some time tomorrow night to fix this up.

[bors]

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

[wesleywiser]

Fixed.

[alexcrichton]

@bors: r+

[bors]

📌 Commit 7581336 has been approved by alexcrichton

[bors]

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

[bors]

⌛ Testing commit 65b0f834cd538a3da551d3355bb134a843c36f37 with merge 0bed0be4d9e06b9eea856120dac66ce2f1a30191...

[bors]

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

[bors]

💔 Test failed - status-travis

[kennytm]

Cannot build bootstrap in distcheck, besides the merge conflict:

[00:14:25] extracting /checkout/obj/build/tmp/distcheck/build/cache/2018-02-20/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:14:25] error: failed to load source for a dependency on `cc`
[00:14:25] 
[00:14:25] Caused by:
[00:14:25]   Unable to update registry `https://github.com/rust-lang/crates.io-index`
[00:14:25] 
[00:14:25] Caused by:
[00:14:25]   failed to update replaced source registry `https://github.com/rust-lang/crates.io-index`
[00:14:25] 
[00:14:25] Caused by:
[00:14:25]   failed to read root of directory source: /checkout/obj/build/tmp/distcheck/src/vendor
[00:14:25] 
[00:14:25] Caused by:
[00:14:25]   No such file or directory (os error 2)

[Mark-Simulacrum]

Fixed and rebased.

@bors r+ p=1

[bors]

📌 Commit 2a6035d has been approved by Mark-Simulacrum

[bors]

⌛ Testing commit 2a6035d3772fb635b2ab73dc24319ddcca029bbb with merge fb3ec5c0902a49bf6744fd8e138fa278a5b0bb4e...

[bors]

💔 Test failed - status-travis

[Mark-Simulacrum]

[02:05:33] Build completed successfully in 1:49:11
[02:05:33] Distcheck rust-src
[02:05:34] error: current package believes it's in a workspace when it's not:
[02:05:34] current:   /checkout/obj/build/tmp/distcheck-src/rust-src/lib/rustlib/src/rust/src/libstd/Cargo.toml
[02:05:34] workspace: /checkout/Cargo.toml
[02:05:34] 
[02:05:34] this may be fixable by adding `obj/build/tmp/distcheck-src/rust-src/lib/rustlib/src/rust/src/libstd` to the `workspace.members` array of the manifest located at: /checkout/Cargo.toml

I'm starting to become frustrated with this -- it looks like every piece of infra doesn't want us to do this.

@alexcrichton Is there a chance you have an easy way to avoid the above error? Maybe we can tell Cargo that the "root" toml file doesn't actually matter for our build directory (note that hard coding this isn't really a good idea since relative build paths are relatively typical AIUI).

[alexcrichton]

Unfortunately I don't think so, there's no way currently to tell Cargo "no please don't look up past this directory for a workspace root"