Add CSS tidy check #74368

GuillaumeGomez · 2020-07-15T15:22:18Z

r? @Mark-Simulacrum

rust-highfive · 2020-07-15T15:22:21Z

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez

Some changes occurred in HTML/CSS themes.

cc @GuillaumeGomez

GuillaumeGomez · 2020-07-15T15:22:38Z

Those messages are getting better and better. XD

Mark-Simulacrum

r=me with nit fixed, though I'd love to see this squashed into two commits: tidy changes and the effects of fixing those.

Mark-Simulacrum · 2020-07-15T15:49:29Z

src/tools/tidy/src/style.rs

@@ -161,6 +174,10 @@ pub fn check(path: &Path, bad: &mut bool) {
            // currently), just the long error code explanation ones.
            return;
        }
+        if filename.ends_with(".css") && !is_in(file, "librustdoc") {


Should this be is_style_file perhaps?

pickfire · 2020-07-15T15:57:17Z

src/tools/tidy/src/style.rs

@@ -136,15 +137,28 @@ macro_rules! suppressible_tidy_err {
    };
 }

+pub fn is_in(full_path: &Path, folder_to_find: &str) -> bool {
+    if let Some(parent) = full_path.parent() {
+        if parent.file_name().map(|f| f.to_string_lossy() == folder_to_find).unwrap_or(false) {


Suggested change

if parent.file_name().map(|f| f.to_string_lossy() == folder_to_find).unwrap_or(false) {

if parent.file_name().map_or_else(false, |f| f.to_string_lossy() == folder_to_find) {

Do we need to_string_lossy?

We need a conversion to string so I took the code from below and didn't change it much.

pickfire · 2020-07-15T16:04:25Z

src/tools/tidy/src/style.rs

@@ -136,15 +137,28 @@ macro_rules! suppressible_tidy_err {
    };
 }

+pub fn is_in(full_path: &Path, folder_to_find: &str) -> bool {


Should we stop iterating on the rust project directory?

let mut full_path = full_path; while let Some(parent) = full_path.parent() { if let Some(f) = parent.file_name() { if f == folder_to_find { return true; } else if f == RUST_DIR { return false; } } full_path = parent; } false

Just an example, it could be shorten.

What is RUST_DIR in this case?

Where rust repository is, I don't know what should it be, is there something like this? I think yours is simpler but it may hit something else created by the user.

Well, it's very unlikely but I can add a check on the parent as well (it might actually be a good idea).

GuillaumeGomez · 2020-07-15T16:06:30Z

@Mark-Simulacrum I cherry-picked the first commit from another PR of mine, this is why there are two commits of tidy fixes. Also github seems kinda down because I force-pushed with only 3 commits a while ago and they still don't show up...

GuillaumeGomez · 2020-07-16T14:22:08Z

Updated!

Mark-Simulacrum · 2020-07-16T15:15:12Z

@bors r+

bors · 2020-07-16T15:15:13Z

📌 Commit 63ffa13 has been approved by Mark-Simulacrum

@Mark-Simulacrum

…rk-Simulacrum Add CSS tidy check r? @Mark-Simulacrum

@Mark-Simulacrum

…rk-Simulacrum Add CSS tidy check r? @Mark-Simulacrum

Manishearth · 2020-07-16T22:55:33Z

This failed its own check #74412 (comment)

@Mark-Simulacrum

…rk-Simulacrum Add CSS tidy check r? @Mark-Simulacrum

bors · 2020-07-17T03:51:23Z

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

Manishearth · 2020-07-17T03:52:34Z

From doing rollups I'm pretty sure some of the PRs that just landed break this, mind rebasing and making sure the new changes pass tidy?

@bors r-

GuillaumeGomez · 2020-07-17T08:13:12Z

The ayu improvements I assume.

GuillaumeGomez · 2020-07-17T08:15:19Z

Rebased.

GuillaumeGomez · 2020-07-17T11:07:59Z

@bors: r=Mark-Simulacrum

bors · 2020-07-17T11:08:01Z

📌 Commit 83ffd5c has been approved by Mark-Simulacrum

@Mark-Simulacrum

…rk-Simulacrum Add CSS tidy check r? @Mark-Simulacrum

@ghost

…arth Rollup of 18 pull requests Successful merges: - rust-lang#71670 (Enforce even more the code blocks attributes check through rustdoc) - rust-lang#73930 (Make some Option methods const) - rust-lang#74009 (Fix MinGW `run-make-fulldeps` tests) - rust-lang#74056 (Add Arguments::as_str().) - rust-lang#74169 (Stop processing unreachable blocks when solving dataflow) - rust-lang#74251 (Teach bootstrap about target files vs target triples) - rust-lang#74288 (Fix src/test/run-make/static-pie/test-aslr.rs) - rust-lang#74300 (Use intra-doc links in core::iter module) - rust-lang#74364 (add lazy normalization regression tests) - rust-lang#74368 (Add CSS tidy check) - rust-lang#74394 (Remove leftover from emscripten fastcomp support) - rust-lang#74411 (Don't assign `()` to `!` MIR locals) - rust-lang#74416 (Use an UTF-8 locale for the linker.) - rust-lang#74424 (Move hir::Place to librustc_middle/hir) - rust-lang#74428 (docs: better demonstrate that None values are skipped as many times a…) - rust-lang#74438 (warn about uninitialized multi-variant enums) - rust-lang#74440 (Fix Arc::as_ptr docs) - rust-lang#74452 (intra-doc links: resolve modules in the type namespace) Failed merges: r? @ghost

rust-highfive assigned Mark-Simulacrum Jul 15, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 15, 2020

Mark-Simulacrum reviewed Jul 15, 2020

View reviewed changes

pickfire reviewed Jul 15, 2020

View reviewed changes

GuillaumeGomez force-pushed the css-tidy-check branch from e94d521 to 529a921 Compare July 15, 2020 16:27

Mark-Simulacrum 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 15, 2020

GuillaumeGomez force-pushed the css-tidy-check branch 2 times, most recently from 24f0c68 to 63ffa13 Compare July 16, 2020 14:19

bors 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 Jul 16, 2020

Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 16, 2020

Rollup merge of rust-lang#74368 - GuillaumeGomez:css-tidy-check, r=Ma…

b13aea2

…rk-Simulacrum Add CSS tidy check r? @Mark-Simulacrum

Manishearth mentioned this pull request Jul 16, 2020

Rollup of 9 pull requests #74412

Closed

Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 16, 2020

Rollup merge of rust-lang#74368 - GuillaumeGomez:css-tidy-check, r=Ma…

a6800e3

…rk-Simulacrum Add CSS tidy check r? @Mark-Simulacrum

Manishearth mentioned this pull request Jul 16, 2020

Rollup of 9 pull requests #74414

Closed

Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 17, 2020

Rollup merge of rust-lang#74368 - GuillaumeGomez:css-tidy-check, r=Ma…

c4b0119

…rk-Simulacrum Add CSS tidy check r? @Mark-Simulacrum

Manishearth mentioned this pull request Jul 17, 2020

Rollup of 8 pull requests #74421

Closed

bors 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 Jul 17, 2020

GuillaumeGomez added 2 commits July 17, 2020 10:14

Convert whitespaces to tabs

6969b30

Add tidy checks for rustdoc css files

3429ded

GuillaumeGomez force-pushed the css-tidy-check branch from 63ffa13 to 72d039d Compare July 17, 2020 08:15

Fix tidy issues

83ffd5c

GuillaumeGomez force-pushed the css-tidy-check branch from 72d039d to 83ffd5c Compare July 17, 2020 08:22

bors 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 Jul 17, 2020

Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 17, 2020

Rollup merge of rust-lang#74368 - GuillaumeGomez:css-tidy-check, r=Ma…

186c984

…rk-Simulacrum Add CSS tidy check r? @Mark-Simulacrum

Manishearth mentioned this pull request Jul 17, 2020

Rollup of 17 pull requests #74455

Closed

Manishearth mentioned this pull request Jul 17, 2020

Rollup of 18 pull requests #74461

Merged

bors merged commit ef0540b into rust-lang:master Jul 18, 2020

GuillaumeGomez deleted the css-tidy-check branch July 20, 2020 08:47

cuviper added this to the 1.47.0 milestone May 2, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add CSS tidy check #74368

Add CSS tidy check #74368

GuillaumeGomez commented Jul 15, 2020

rust-highfive commented Jul 15, 2020

GuillaumeGomez commented Jul 15, 2020

Mark-Simulacrum left a comment

Mark-Simulacrum Jul 15, 2020

GuillaumeGomez Jul 15, 2020

pickfire Jul 15, 2020

GuillaumeGomez Jul 15, 2020

pickfire Jul 15, 2020

GuillaumeGomez Jul 15, 2020

pickfire Jul 16, 2020

GuillaumeGomez Jul 16, 2020

GuillaumeGomez commented Jul 15, 2020

GuillaumeGomez commented Jul 16, 2020

Mark-Simulacrum commented Jul 16, 2020

bors commented Jul 16, 2020

Manishearth commented Jul 16, 2020

bors commented Jul 17, 2020

Manishearth commented Jul 17, 2020

GuillaumeGomez commented Jul 17, 2020

GuillaumeGomez commented Jul 17, 2020

GuillaumeGomez commented Jul 17, 2020

bors commented Jul 17, 2020

	if parent.file_name().map(\|f\| f.to_string_lossy() == folder_to_find).unwrap_or(false) {
	if parent.file_name().map_or_else(false, \|f\| f.to_string_lossy() == folder_to_find) {

Add CSS tidy check #74368

Add CSS tidy check #74368

Conversation

GuillaumeGomez commented Jul 15, 2020

rust-highfive commented Jul 15, 2020

GuillaumeGomez commented Jul 15, 2020

Mark-Simulacrum left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

GuillaumeGomez commented Jul 15, 2020

GuillaumeGomez commented Jul 16, 2020

Mark-Simulacrum commented Jul 16, 2020

bors commented Jul 16, 2020

Manishearth commented Jul 16, 2020

bors commented Jul 17, 2020

Manishearth commented Jul 17, 2020

GuillaumeGomez commented Jul 17, 2020

GuillaumeGomez commented Jul 17, 2020

GuillaumeGomez commented Jul 17, 2020

bors commented Jul 17, 2020