Enforce rustfmt on CI #22126

pyfisch · 2018-11-06T15:13:57Z

This change is

highfive · 2018-11-06T15:14:02Z

Heads up! This PR modifies the following files:

@jgraham: components/webdriver_server/lib.rs
@wafflespeanut: python/servo/devenv_commands.py, python/servo/testing_commands.py
@emilio: components/style/gecko_bindings/sugar/ns_css_value.rs, components/style/dom_apis.rs, components/style/gecko/url.rs, components/style/animation.rs, components/style/values/specified/text.rs and 58 more
@KiChjang: components/script/dom/request.rs, components/script/dom/timeranges.rs, components/script/dom/htmlcanvaselement.rs, components/script/textinput.rs, components/script/dom/eventtarget.rs and 80 more
@asajeffrey: components/script/dom/request.rs, components/script/dom/timeranges.rs, components/script/dom/htmlcanvaselement.rs, components/script/textinput.rs, components/script/dom/eventtarget.rs and 77 more
@cbrewster: components/constellation/network_listener.rs, components/constellation/constellation.rs, components/constellation/pipeline.rs
@paulrouget: components/compositing/build.rs, components/constellation/network_listener.rs, components/constellation/constellation.rs, components/servo/lib.rs, components/constellation/pipeline.rs and 1 more

highfive · 2018-11-06T15:14:04Z

Warning

These commits modify unsafe code. Please review it carefully!

CYBAI · 2018-11-06T15:22:41Z

If this one is merged, maybe we can close the RFC PR #20617 from @emilio and close the #21373 issue?

pyfisch · 2018-11-06T15:27:23Z

Yes this is a replacement for #20617. Rustfmt is now installed with rustup and not with cargo anymore.

emilio · 2018-11-06T15:41:10Z

If we do this, which makes more annoying for me to port Gecko changes, can we enable the reordering of imports and such, and remove the tidy one?

At least that'd be roughly neutral or even positive on the effort it takes me :)

Also, maybe, remove the match_block_trailing_comma thing while at it?

emilio · 2018-11-06T15:41:57Z

python/servo/testing_commands.py

@@ -304,6 +304,12 @@ def test_content(self):
              "tests/wpt/mozilla/.")
        return 0

+    def install_rustfmt(self):
+        if self.call_rustup_run(["cargo", "fmt", "--version", "-q"],
+                                stderr=open(os.devnull, "w")) != 0:


Doesn't this leak the file descriptor?

Good catch!

jdm · 2018-11-06T15:44:25Z

Let's have two more commits - one that disables the tidy check for import ordering, and one that enables rustfmt import reordering and formats the whole tree with it.

jdm · 2018-11-06T19:45:26Z

@bors-servo r+

bors-servo · 2018-11-06T19:45:26Z

📌 Commit 5de5fab has been approved by jdm

jdm · 2018-11-06T19:46:19Z

@bors-servo r-
test-tidy complains about some line lengths now.

jdm · 2018-11-06T19:47:07Z

Also apparently travis is not set up to run cargo fmt yet:

./components/script/dom/bluetoothcharacteristicproperties.rs:6: Line is longer than 120 characters
./components/script/dom/bluetoothremotegattcharacteristic.rs:8: Line is longer than 120 characters
./components/script/dom/bluetoothremotegattcharacteristic.rs:10: Line is longer than 120 characters
./components/script/dom/bluetoothremotegattdescriptor.rs:8: Line is longer than 120 characters
Running the dependency licensing lint...
It looks like rustup is not installed. See instructions at https://github.com/servo/servo/#setting-up-your-environment
It looks like rustup is not installed. See instructions at https://github.com/servo/servo/#setting-up-your-environment
It looks like rustup is not installed. See instructions at https://github.com/servo/servo/#setting-up-your-environment

jdm · 2018-11-06T19:47:39Z

And the selftests failed:

======================================================================
FAIL: test_rust (servo_tidy_tests.test_tidy.CheckTidiness)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/travis/build/servo/servo/python/tidy/servo_tidy_tests/test_tidy.py", line 108, in test_rust
    self.assertEqual('extra space after {', errors.next()[2])
AssertionError: 'extra space after {' != 'missing space before }'
----------------------------------------------------------------------
Ran 28 tests in 0.030s
FAILED (failures=1)
The command "./mach test-tidy --no-progress --self-test" exited with 1.

pyfisch · 2018-11-06T19:49:59Z

I've pushed the two commits as suggested by @jdm.

There are still a few problems with this PR:

~~On Travis CI the first build does not install rustup. For this reason ./mach test-tidy fails now. Install rustup there too?~~ done
I used #![rustup::skip] in two files to stop rustfmt from mangling whitespace (introduce trailing whitespace to block comments) but this causes the error error[E0658]: non-builtin inner attributes are unstable. What to do here? use outer attributes
*Rustfmt formats imports in 4 cases such that the lines are longer than 120 characters which causes a tidy error: use dom::bindings::codegen::Bindings::BluetoothCharacteristicPropertiesBinding::BluetoothCharacteristicPropertiesMethods; These cases are ignored with the is_unsplittable line test
Also, maybe, remove the match_block_trailing_comma thing while at it?

I think this a good idea. It does not disrupt test-tidy.

bors-servo · 2018-11-06T21:10:14Z

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


        Run rustfmt on test-tidy

Add ./mach fmt command. Mach installs rustfmt if needed.


        Format remaining files

pyfisch · 2018-11-06T22:36:23Z

Rebased and fixed. Lets see if it works in Travis.

jdm · 2018-11-07T00:31:40Z

tidy reported no errors.
It looks like rustup is not installed. See instructions at https://github.com/servo/servo/#setting-up-your-environment
It looks like rustup is not installed. See instructions at https://github.com/servo/servo/#setting-up-your-environment
It looks like rustup is not installed. See instructions at https://github.com/servo/servo/#setting-up-your-environment
The command "./mach test-tidy --no-progress --all" exited with 1.


        Fix test-tidy self test

Install rustup on first Travis job. Only use rustfmt::skip as an outer attribute.

pyfisch · 2018-11-07T10:00:28Z

Travis now passes.

AppVeyor has some connectivity issues:

The remote server returned an error: (503) Server Unavailable. Service Unavailable

jdm · 2018-11-07T13:27:42Z

@bors-servo r+

bors-servo · 2018-11-07T13:27:43Z

📌 Commit 1855c88 has been approved by jdm

bors-servo · 2018-11-07T13:47:59Z

⌛ Testing commit 1855c88 with merge da2d9b2...


        Auto merge of #22126 - pyfisch:autoformat, r=jdm

Enforce rustfmt on CI  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22126)

bors-servo · 2018-11-07T15:13:30Z

☀️ Test successful - android, android-mac, android-x86, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, status-taskcluster, windows-msvc-dev
Approved by: jdm
Pushing da2d9b2 to master...

SimonSapin · 2018-11-07T18:36:49Z

Nice! @pyfisch, are you subscribed to the dev-servo mailing list? I think it’d be nice to send an announcement there with:

A link to this PR
Format checking is now part of ./mach test-tidy, so unformatted code will fail CI
./mach fmt does the formatting
Import ordering has changed (but mach fmt will fix it)

If you prefer I can do it for you :)

pyfisch · 2018-11-07T19:05:44Z

Sent an email.


        Bug 1505618 - Import formatting changes from servo/servo#22126.


        Bug 1505618 - Import formatting changes from servo/servo#22126.

highfive assigned Manishearth Nov 6, 2018

highfive added the S-awaiting-review label Nov 6, 2018

emilio reviewed Nov 6, 2018

View changes

jdm approved these changes Nov 6, 2018

View changes

jdm added S-needs-code-changes and removed S-awaiting-review labels Nov 6, 2018

highfive added S-awaiting-review and removed S-needs-code-changes labels Nov 6, 2018

highfive assigned jdm and unassigned Manishearth Nov 6, 2018

highfive added S-awaiting-merge and removed S-awaiting-review labels Nov 6, 2018

jdm added S-fails-tidy and removed S-awaiting-merge labels Nov 6, 2018

highfive added the S-needs-rebase label Nov 6, 2018

pyfisch added 2 commits Oct 15, 2018

Run rustfmt on test-tidy

bf47f90

Add ./mach fmt command. Mach installs rustfmt if needed.

Format remaining files

cb07deb

pyfisch force-pushed the pyfisch:autoformat branch from 5de5fab to f9c144c Nov 6, 2018

highfive added the S-awaiting-review label Nov 6, 2018

Fix test-tidy self test

Loading status checks…

1855c88

Install rustup on first Travis job. Only use rustfmt::skip as an outer attribute.

pyfisch force-pushed the pyfisch:autoformat branch from f9c144c to 1855c88 Nov 7, 2018

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-rebase labels Nov 7, 2018

bors-servo merged commit 1855c88 into servo:master Nov 7, 2018
2 of 3 checks passed

2 of 3 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label Nov 7, 2018

This was referenced Nov 7, 2018

[WIP RFC] Enforce rustfmt on automation. #20617

Closed

Format all code with rustfmt #21373

Closed

Format our code with rustfmt #8553

Closed

pyfisch deleted the pyfisch:autoformat branch Nov 7, 2018

moz-v2v-gh pushed a commit to mozilla/gecko-dev that referenced this pull request Nov 7, 2018

Bug 1505618 - Import formatting changes from servo/servo#22126.

176fa63

xeonchen pushed a commit to xeonchen/gecko that referenced this pull request Nov 8, 2018

Bug 1505618 - Import formatting changes from servo/servo#22126.

8256b8f

servo / servo

Enforce rustfmt on CI #22126

Enforce rustfmt on CI #22126

pyfisch commented Nov 6, 2018 •

edited by SimonSapin

highfive commented Nov 6, 2018

highfive commented Nov 6, 2018

CYBAI commented Nov 6, 2018

pyfisch commented Nov 6, 2018

emilio commented Nov 6, 2018

This comment has been minimized.

This comment has been minimized.

jdm commented Nov 6, 2018

jdm commented Nov 6, 2018

bors-servo commented Nov 6, 2018

jdm commented Nov 6, 2018

jdm commented Nov 6, 2018

jdm commented Nov 6, 2018

pyfisch commented Nov 6, 2018 •

edited

bors-servo commented Nov 6, 2018

pyfisch commented Nov 6, 2018

jdm commented Nov 7, 2018

pyfisch commented Nov 7, 2018

jdm commented Nov 7, 2018

bors-servo commented Nov 7, 2018

bors-servo commented Nov 7, 2018

bors-servo commented Nov 7, 2018

SimonSapin commented Nov 7, 2018

pyfisch commented Nov 7, 2018

servo / servo

Join GitHub today

Enforce rustfmt on CI #22126

Enforce rustfmt on CI #22126

Conversation

pyfisch commented Nov 6, 2018 • edited by SimonSapin

highfive commented Nov 6, 2018

highfive commented Nov 6, 2018

CYBAI commented Nov 6, 2018

pyfisch commented Nov 6, 2018

emilio commented Nov 6, 2018

This comment has been minimized.

emilio Nov 6, 2018

This comment has been minimized.

pyfisch Nov 6, 2018

jdm commented Nov 6, 2018

jdm commented Nov 6, 2018

bors-servo commented Nov 6, 2018

jdm commented Nov 6, 2018

jdm commented Nov 6, 2018

jdm commented Nov 6, 2018

pyfisch commented Nov 6, 2018 • edited

bors-servo commented Nov 6, 2018

pyfisch commented Nov 6, 2018

jdm commented Nov 7, 2018

pyfisch commented Nov 7, 2018

jdm commented Nov 7, 2018

bors-servo commented Nov 7, 2018

bors-servo commented Nov 7, 2018

bors-servo commented Nov 7, 2018

SimonSapin commented Nov 7, 2018

pyfisch commented Nov 7, 2018

pyfisch commented Nov 6, 2018 •

edited by SimonSapin

pyfisch commented Nov 6, 2018 •

edited