Run rustfmt on selectors, servo_arc, and style #20603

bholley · 2018-04-10T01:34:34Z

Now that rustfmt is getting close to stable, and work on the style system has died down a bit, it seemed like an opportune time to auto-format the style crates.

The first commit disables import reordering, since tidy and rustfmt don't currently agree on the correct ordering. The second commit does a bunch of manual fixups such that the output of rustfmt passes tidy. The third commit runs rustfmt on the three aforementioned crate.

There are a few dozen warnings in the style crate about lines longer than 100 characters. It would be good to fix these, but I don't have time for that now.

This change is

highfive · 2018-04-10T01:34:39Z

Heads up! This PR modifies the following files:

@canaltinova: components/style/values/computed/pointing.rs, components/style/values/generics/flex.rs, components/style/stylesheets/style_rule.rs, components/style/gecko_bindings/sugar/ns_css_value.rs, components/style/invalidation/element/invalidator.rs and 166 more
@emilio: components/style/values/computed/pointing.rs, components/style/values/generics/flex.rs, components/style/stylesheets/style_rule.rs, components/style/gecko_bindings/sugar/ns_css_value.rs, components/style/invalidation/element/invalidator.rs and 166 more

highfive · 2018-04-10T01:34:41Z

Warning

These commits modify unsafe code. Please review it carefully!
These commits modify style code, but no tests are modified. Please consider adding a test!

bholley · 2018-04-10T01:43:25Z

CC @upsuper @emilio @SimonSapin @pcwalton @nox @nrc

bholley · 2018-04-10T01:46:07Z

(and @heycam of course)

r? @SimonSapin

bholley · 2018-04-10T01:46:24Z

CC @Manishearth also

upsuper · 2018-04-10T03:59:37Z

I wonder is this really just running rustfmt on the crates? It seems to be doing more things than I would thought a formatter normally does, e.g. removing use for those only used once.

Also I find it a bit hard to follow how some decision is made for formatting, for example, I see conversion from single line if ... { A } else { B } to multi-line, and vice versa.

upsuper · 2018-04-10T04:01:12Z

Hmmm, actually not. Many of the changes I wouldn't expect formatter to do are from the manual fixup. That explains :)

emilio · 2018-04-10T06:07:03Z

components/selectors/parser.rs

-                                )
-                            })?
-                        )
+                        let r = input.parse_nested_block(|input| {


what does r mean? Maybe just selector?

emilio · 2018-04-10T06:25:21Z

CI is also red:

error: unused import: `malloc_size_of::MallocUnconditionalShallowSizeOf`
  --> components/style/stylesheets/style_rule.rs:10:5
   |
10 | use malloc_size_of::MallocUnconditionalShallowSizeOf;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = note: `-D unused-imports` implied by `-D warnings`

bors-servo · 2018-04-10T07:30:54Z

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

SimonSapin · 2018-04-10T14:11:27Z

@bholley Could you include in the PR message (which will go in the merge commit) what version of rustfmt you used and what command you ran to produce this commit?

bholley · 2018-04-10T17:31:47Z

Addressed review comments. If someone could stamp this soon I'd appreciate it, since it bitrots quickly. :-)

bors-servo · 2018-04-10T19:10:48Z

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

Manishearth

r=me

bholley · 2018-04-10T23:26:16Z

@bors-servo r=Manishearth

bors-servo · 2018-04-10T23:26:17Z

📌 Commit b3d39c4 has been approved by Manishearth

emilio

There are a few of these that look like regressions to me. Maybe @nrc may take a look and see if there's something unexpected in some of these?

Also, is there any plan / way to enforce its usage? My plan to start doing this, btw, was enforcing usage of rustfmt-format-diff (https://github.com/rust-lang-nursery/rustfmt/blob/master/src/format-diff/main.rs) on incoming commits. But not sure if there's any better idea around.

Anyway, as much as I dislike some particular changes, consistency is king I guess...

emilio · 2018-04-10T23:35:42Z

components/selectors/attr.rs

-                                  .any(|part| case.eq(part.as_bytes(), s))
-            }
+            },
+            AttrSelectorOperator::Includes => element_attr_value


Weird that this didn't include braces.

emilio · 2018-04-10T23:35:42Z

components/selectors/builder.rs

-            Component::Slotted(..) |
-            Component::PseudoElement(..) |
-            Component::LocalName(..) => {
+            Component::Slotted(..) | Component::PseudoElement(..) | Component::LocalName(..) => {


This doesn't look better, honestly, but I guess it's fine.

emilio · 2018-04-10T23:35:42Z

components/selectors/matching.rs

@@ -52,8 +52,8 @@ impl ElementSelectorFlags {
    /// Returns the subset of flags that apply to the parent.
    pub fn for_parent(self) -> ElementSelectorFlags {
        self & (ElementSelectorFlags::HAS_SLOW_SELECTOR |
-                ElementSelectorFlags::HAS_SLOW_SELECTOR_LATER_SIBLINGS |


This also looks spooky.

emilio · 2018-04-10T23:35:42Z

components/selectors/matching.rs

+                matches!(
+                    selector.combinator_at_parse_order(from_offset),
+                    Combinator::SlotAssignment | Combinator::PseudoElement
+                )),


Don't understand how this makes more sense than what we had either but.. I guess.

emilio · 2018-04-10T23:35:42Z

components/selectors/matching.rs

-            },
-            _ => true,
-        }
+    let all_match = selector_iter.clone().all(|simple| match *simple {


Ugh, this one looks really bad :(

emilio · 2018-04-10T23:35:42Z

components/style/counter_style/mod.rs

@@ -149,7 +156,7 @@ impl<'a, 'b, 'i> AtRuleParser<'i> for CounterStyleRuleParser<'a, 'b> {

 macro_rules! checker {
    ($self:ident._($value:ident)) => {};
-    ($self:ident.$checker:ident($value:ident)) => {
+    ($self:ident. $checker:ident($value:ident)) => {


This is touching a macro, and I'm not sure it's fine, actually... I guess it is but it looks fishy at best.

emilio · 2018-04-10T23:35:42Z

components/style/dom.rs

-    + Clone
-    + SelectorsElement<Impl = SelectorImpl>
+pub trait TElement:
+    Eq + PartialEq + Debug + Hash + Sized + Copy + Clone + SelectorsElement<Impl = SelectorImpl>


This looks also like a regression to me, but...

emilio · 2018-04-10T23:35:42Z

components/style/error_reporting.rs

-                write!(f, "Invalid @counter-style rule: 'system: extends …' with 'additive-symbols'")
-            }
+            },
+            ContextualParseError::InvalidCounterStyleWithoutSymbols(ref system) => write!(


These look way worse too.

emilio · 2018-04-10T23:35:42Z

components/style/values/specified/outline.rs

-#[derive(Clone, Copy, Debug, Eq, MallocSizeOf, Ord)]
-#[derive(PartialEq, PartialOrd, ToComputedValue, ToCss)]
+#[derive(Clone, Copy, Debug, Eq, MallocSizeOf, Ord, PartialEq, PartialOrd, ToComputedValue,
+         ToCss)]


It also merges #[derive(..)] lines? Is there a way to prevent it from doing that?

emilio · 2018-04-10T23:35:42Z

components/selectors/builder.rs

-    )
-    where
-        Impl: SelectorImpl
+    ) where


This () where) looks weird, is it expected?

bors-servo · 2018-04-10T23:47:20Z

🔒 Merge conflict

bors-servo · 2018-04-10T23:47:59Z

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


        Disable import reordering for now.

Tidy wants it one way, and the latest nightly of rustfmt wants it another way.


        Manual fixups so that the rustfmt output won't trigger tidy.


        Run rustfmt on selectors, servo_arc, and style.

This was generated with: ./mach cargo fmt --package selectors && ./mach cargo fmt --package servo_arc && ./mach cargo fmt --package style Using rustfmt 0.4.1-nightly (a4462d1 2018-03-26)

emilio · 2018-04-11T00:36:08Z

FWIW I think something like #20617 would be less invasive. Arguably needs more polish and what not. But massive reformats pollute the history quite heavily, it's better to do it incrementally if possible IMO.

bholley · 2018-04-11T00:59:59Z

The downsides I see to per-patch reformatting are:
(1) Patches that should otherwise be small (i.e. renames) can suddenly get big as they reformat surrounding code, making them harder to review.
(2) It's harder for new contributors to infer the correct style from surrounding code, because it may or may not be consistent with the canonical style.

There's definitely room for disagreement here. But given that most people have expressed approval for doing it this way, and given that I've already done the work here, I'm inclined to land it.

bholley · 2018-04-11T01:00:08Z

@bors-servo r=Manishearth p=5

bors-servo · 2018-04-11T01:00:08Z

📌 Commit c99bcdd has been approved by Manishearth

bors-servo · 2018-04-11T01:00:13Z

⌛ Testing commit c99bcdd with merge 9a900ef...


        Auto merge of #20603 - bholley:rustfmt_style, r=Manishearth

Run rustfmt on selectors, servo_arc, and style Now that rustfmt is getting close to stable, and work on the style system has died down a bit, it seemed like an opportune time to auto-format the style crates. The first commit disables import reordering, since tidy and rustfmt don't currently agree on the correct ordering. The second commit does a bunch of manual fixups such that the output of rustfmt passes tidy. The third commit runs rustfmt on the three aforementioned crate. There are a few dozen warnings in the style crate about lines longer than 100 characters. It would be good to fix these, but I don't have time for that now.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20603)

bors-servo · 2018-04-11T02:35:07Z

☀️ Test successful - android, 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, windows-msvc-dev
Approved by: Manishearth
Pushing 9a900ef to master...

highfive assigned glennw Apr 10, 2018

highfive added the S-awaiting-review label Apr 10, 2018

highfive assigned SimonSapin and unassigned glennw Apr 10, 2018

emilio reviewed Apr 10, 2018

View changes

components/selectors/parser.rs Outdated

)

})?

)

let r = input.parse_nested_block(|input| {

This comment has been minimized.

Sign in to view

emilio Apr 10, 2018
Member

what does r mean? Maybe just selector?

highfive added the S-needs-rebase label Apr 10, 2018

bholley force-pushed the bholley:rustfmt_style branch from 3f08166 to e55b414 Apr 10, 2018

highfive added the S-needs-rebase label Apr 10, 2018

bholley force-pushed the bholley:rustfmt_style branch from e55b414 to b3d39c4 Apr 10, 2018

Manishearth approved these changes Apr 10, 2018

View changes

highfive assigned Manishearth and unassigned SimonSapin Apr 10, 2018

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-rebase labels Apr 10, 2018

emilio approved these changes Apr 10, 2018

View changes

highfive added S-needs-rebase and removed S-awaiting-merge labels Apr 10, 2018

bholley added 3 commits Apr 10, 2018

Disable import reordering for now.

b292f78

Tidy wants it one way, and the latest nightly of rustfmt wants it another way.

Manual fixups so that the rustfmt output won't trigger tidy.

f7ae1a3

Run rustfmt on selectors, servo_arc, and style.

Loading status checks…

c99bcdd

This was generated with: ./mach cargo fmt --package selectors && ./mach cargo fmt --package servo_arc && ./mach cargo fmt --package style Using rustfmt 0.4.1-nightly (a4462d1 2018-03-26)

bholley force-pushed the bholley:rustfmt_style branch from b3d39c4 to c99bcdd Apr 11, 2018

highfive added the S-awaiting-review label Apr 11, 2018

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-rebase labels Apr 11, 2018

bors-servo merged commit c99bcdd into servo:master Apr 11, 2018
3 checks passed

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

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

homu Test successful
Details

highfive removed the S-awaiting-merge label Apr 11, 2018

bors-servo mentioned this pull request Apr 11, 2018

style: Cascade custom properties specially in a fast path. #20151

Closed

servo / servo

Run rustfmt on selectors, servo_arc, and style #20603

Run rustfmt on selectors, servo_arc, and style #20603

bholley commented Apr 10, 2018 •

edited by SimonSapin

highfive commented Apr 10, 2018

highfive commented Apr 10, 2018

bholley commented Apr 10, 2018

bholley commented Apr 10, 2018

bholley commented Apr 10, 2018

upsuper commented Apr 10, 2018

upsuper commented Apr 10, 2018 •

edited

This comment has been minimized.

emilio commented Apr 10, 2018

bors-servo commented Apr 10, 2018

SimonSapin commented Apr 10, 2018

bholley commented Apr 10, 2018

bors-servo commented Apr 10, 2018

Manishearth left a comment

bholley commented Apr 10, 2018

bors-servo commented Apr 10, 2018

emilio left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors-servo commented Apr 10, 2018

bors-servo commented Apr 10, 2018

emilio commented Apr 11, 2018

bholley commented Apr 11, 2018

bholley commented Apr 11, 2018

bors-servo commented Apr 11, 2018

bors-servo commented Apr 11, 2018

bors-servo commented Apr 11, 2018

servo / servo

Join GitHub today

Run rustfmt on selectors, servo_arc, and style #20603

Run rustfmt on selectors, servo_arc, and style #20603

Conversation

bholley commented Apr 10, 2018 • edited by SimonSapin

highfive commented Apr 10, 2018

highfive commented Apr 10, 2018

bholley commented Apr 10, 2018

bholley commented Apr 10, 2018

bholley commented Apr 10, 2018

upsuper commented Apr 10, 2018

upsuper commented Apr 10, 2018 • edited

This comment has been minimized.

emilio commented Apr 10, 2018

bors-servo commented Apr 10, 2018

SimonSapin commented Apr 10, 2018

bholley commented Apr 10, 2018

bors-servo commented Apr 10, 2018

Manishearth left a comment

bholley commented Apr 10, 2018

bors-servo commented Apr 10, 2018

emilio left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors-servo commented Apr 10, 2018

bors-servo commented Apr 10, 2018

emilio commented Apr 11, 2018

bholley commented Apr 11, 2018

bholley commented Apr 11, 2018

bors-servo commented Apr 11, 2018

bors-servo commented Apr 11, 2018

bors-servo commented Apr 11, 2018

bholley commented Apr 10, 2018 •

edited by SimonSapin

upsuper commented Apr 10, 2018 •

edited