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.

Sign up for GitHub

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

Jump to bottom

rustbuild: Allow setting rls/rustfmt to "broken" #45243

Merged
merged 1 commit into from
Oct 16, 2017
Merged

rustbuild: Allow setting rls/rustfmt to "broken" #45243

merged 1 commit into from
Oct 16, 2017

Conversation

alexcrichton
Copy link
Member

This commit enables configuring the RLS/rustfmt tools to the "broken" state and
actually get it past CI. The main changes here were to update all dist-related
code to handle the situation where the RLS isn't available. This in turn
involved a homegrown preprocessor-like-function to edit the configuration files
we pass to the various combined installer tools.

@rust-highfive
Copy link
Collaborator

r? @aturon

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

@alexcrichton
Copy link
Member Author

r? @Mark-Simulacrum

Note that the latter commit is here to test this out on Windows/Mac/Linux with a "broken" rls to make sure this actually works, this shouldn't be r+'d as-is just yet.

I'm also all for other suggestions of how to handle this!

Mark-Simulacrum
Mark-Simulacrum reviewed Oct 13, 2017
View reviewed changes
src/bootstrap/dist.rs Outdated
@@ -1245,35 +1254,38 @@ impl Step for Extended {
}
rtf.push_str("}");

fn filter(contents: &str, marker: &str) -> String {
let start = format!("{}-start", marker);
let end = format!("{}-end", marker);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's have something like tool-rls-start instead of just rls-start to avoid the unfortunate (and hard to debug)` situation with two tools that have the same suffix conflicting here.

@Mark-Simulacrum
Copy link
Member

Yeah, not a huge fan of how much code had to change to make this happen, but seems like it's probably necessary at least before a larger rewrite of the dist part of rustbuild... seems good to me, other than the small nit.

@alexcrichton
Copy link
Member Author

@Mark-Simulacrum yeah I'm not personally too happy with how it turned out but then again I've also never been happy with hour our distribution-related code looked, so it's not all that worse!

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 14, 2017
@alexcrichton
Copy link
Member Author

@bors: r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Oct 14, 2017

📌 Commit 75b61b7 has been approved by Mark-Simulacrum

@kennytm kennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 14, 2017
@alexcrichton alexcrichton mentioned this pull request Oct 14, 2017
Merged
@bors
Copy link
Contributor

bors commented Oct 15, 2017

⌛ Testing commit 75b61b7899dd6583311563c4b087ba4880b59837 with merge ae4fb1330c1a415aa50b2c280d03036a7c0b23bf...

@bors
Copy link
Contributor

bors commented Oct 16, 2017

💔 Test failed - status-appveyor

@kennytm
Copy link
Member

kennytm commented Oct 16, 2017

dist-alt x86_64-pc-windows-msvc failed after successfully compiling stage2-rls.

[01:07:10]    Compiling rls-vfs v0.4.4
[01:08:45]     Finished release [optimized] target(s) in 342.61 secs
[01:11:10] thread 'main' panicked at 'fs::read_dir(src) failed with The system cannot find the path specified. (os error 3)', src\bootstrap\util.rs:56:13
[01:11:10] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:11:10] failed to run: C:\projects\rust\build\bootstrap\debug\bootstrap dist
[01:11:10] Build completed unsuccessfully in 1:06:57

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 16, 2017
@alexcrichton
rustbuild: Allow setting rls/rustfmt to "broken"
5050dad 
This commit enables configuring the RLS/rustfmt tools to the "broken" state and
actually get it past CI. The main changes here were to update all dist-related
code to handle the situation where the RLS isn't available. This in turn
involved a homegrown preprocessor-like-function to edit the configuration files
we pass to the various combined installer tools.
@alexcrichton
Copy link
Member Author

@bors: r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Oct 16, 2017

📌 Commit 5050dad has been approved by Mark-Simulacrum

@kennytm kennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 16, 2017
@bors
Copy link
Contributor

bors commented Oct 16, 2017

⌛ Testing commit 5050dad with merge 4e9527c...

bors added a commit that referenced this pull request Oct 16, 2017
@bors
Auto merge of #45243 - alexcrichton:tool-rls-rustfmt, r=Mark-Simulacrum
4e9527c 
 rustbuild: Allow setting rls/rustfmt to "broken"

This commit enables configuring the RLS/rustfmt tools to the "broken" state and
actually get it past CI. The main changes here were to update all dist-related
code to handle the situation where the RLS isn't available. This in turn
involved a homegrown preprocessor-like-function to edit the configuration files
we pass to the various combined installer tools.
@bors
Copy link
Contributor

bors commented Oct 16, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing 4e9527c to master...

@bors bors merged commit 5050dad into rust-lang:master Oct 16, 2017
@bors bors mentioned this pull request Oct 16, 2017
Merged
@alexcrichton alexcrichton deleted the tool-rls-rustfmt branch October 28, 2017 12:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@alexcrichton @rust-highfive @Mark-Simulacrum @bors @kennytm @aturon