rustbuild: Allow setting rls/rustfmt to "broken" by alexcrichton · Pull Request #45243 · rust-lang/rust

alexcrichton · 2017-10-12T19:46:55Z

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 · 2017-10-12T19:47:01Z

r? @aturon

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

alexcrichton · 2017-10-12T19:47:39Z

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 · 2017-10-13T01:20:29Z

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 · 2017-10-13T01:21:45Z

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 · 2017-10-14T00:27:22Z

@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!

alexcrichton · 2017-10-14T14:23:17Z

@bors: r=Mark-Simulacrum

bors · 2017-10-14T14:23:18Z

📌 Commit 75b61b7 has been approved by Mark-Simulacrum

bors · 2017-10-15T23:18:20Z

⌛ Testing commit 75b61b7899dd6583311563c4b087ba4880b59837 with merge ae4fb1330c1a415aa50b2c280d03036a7c0b23bf...

bors · 2017-10-16T00:32:07Z

💔 Test failed - status-appveyor

kennytm · 2017-10-16T06:12:37Z

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

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 · 2017-10-16T16:07:08Z

@bors: r=Mark-Simulacrum

bors · 2017-10-16T16:07:11Z

📌 Commit 5050dad has been approved by Mark-Simulacrum

bors · 2017-10-16T18:52:21Z

⌛ Testing commit 5050dad with merge 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 · 2017-10-16T21:29:48Z

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

rust-highfive assigned aturon Oct 12, 2017

rust-highfive assigned Mark-Simulacrum and unassigned aturon Oct 12, 2017

Mark-Simulacrum reviewed Oct 13, 2017
View reviewed changes

alexcrichton force-pushed the tool-rls-rustfmt branch from ad6e880 to 874e135Compare October 13, 2017 17:52

alexcrichton force-pushed the tool-rls-rustfmt branch from 874e135 to 47dde89Compare October 14, 2017 00:27

kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 14, 2017

alexcrichton force-pushed the tool-rls-rustfmt branch from 47dde89 to 75b61b7Compare October 14, 2017 14:23

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 mentioned this pull request Oct 14, 2017
Documenting the process for when rustfmt/rls break #45098
Merged

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 force-pushed the tool-rls-rustfmt branch from 75b61b7 to 5050dadCompare October 16, 2017 16:07

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 merged commit 5050dad into rust-lang:masterOct 16, 2017

bors mentioned this pull request Oct 16, 2017
[Syntax] Implement auto trait syntax #45247
Merged

alexcrichton deleted the tool-rls-rustfmt branch October 28, 2017 12:56

Uh oh!

Uh oh!

Conversation

alexcrichton commented Oct 12, 2017

Uh oh!

rust-highfive commented Oct 12, 2017

Uh oh!

alexcrichton commented Oct 12, 2017

Uh oh!

Mark-SimulacrumOct 13, 2017

Choose a reason for hiding this comment

Uh oh!

Mark-Simulacrum commented Oct 13, 2017

Uh oh!

alexcrichton commented Oct 14, 2017

Uh oh!

alexcrichton commented Oct 14, 2017

Uh oh!

bors commented Oct 14, 2017

Uh oh!

bors commented Oct 15, 2017

Uh oh!

bors commented Oct 16, 2017

Uh oh!

kennytm commented Oct 16, 2017

Uh oh!

alexcrichton commented Oct 16, 2017

Uh oh!

bors commented Oct 16, 2017

Uh oh!

bors commented Oct 16, 2017

Uh oh!

bors commented Oct 16, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants