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.

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

Spaces #86274

Merged
merged 1 commit into from Jun 21, 2021
Merged

Spaces #86274

merged 1 commit into from Jun 21, 2021

Conversation

@alexander-melentyev
Copy link
Contributor

@alexander-melentyev alexander-melentyev commented Jun 13, 2021

No description provided.

@rust-highfive
Copy link
Collaborator

@rust-highfive rust-highfive commented Jun 13, 2021

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez

Some changes occurred in src/tools/rustfmt.

cc @calebcartwright

Some changes occurred in src/tools/clippy.

cc @rust-lang/clippy

@rust-highfive
Copy link
Collaborator

@rust-highfive rust-highfive commented Jun 13, 2021

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Jun 13, 2021

Thanks! Wonder if it would worth it to add a tidy check for that...

@alexander-melentyev
Copy link
Contributor Author

@alexander-melentyev alexander-melentyev commented Jun 13, 2021

You are welcome! Why not?

@GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Jun 13, 2021

For me we should, but not sure if it's worth it, that's pretty much all. :)

Considering you made changes to .patch files, I'll wait for someone from the @rust-lang/infra team to take a look.

@alexander-melentyev
Copy link
Contributor Author

@alexander-melentyev alexander-melentyev commented Jun 13, 2021

Ok

@calebcartwright
Copy link
Member

@calebcartwright calebcartwright commented Jun 13, 2021

Some of these changes are stripping two consecutive spaces off the end of lines in markdown files, which I believe is significant/possibly intentional due to how markdown does line breaking.

Are we sure all these changes are desired, including for the tools that are primarily developed externally?

@alexander-melentyev
Copy link
Contributor Author

@alexander-melentyev alexander-melentyev commented Jun 14, 2021

@calebcartwright, You're absolutely right about the two spaces in markdown. Add two spaces back

if (flags != 1) /* not lone -s */
--
--
2.25.1

This comment has been minimized.

@bjorn3

bjorn3 Jun 14, 2021
Contributor

Patch files shouldn't be changed IMO. These spaces are inserted by git, so removing them would mean that applying and recreating the patch would result in a different patch file.

This comment has been minimized.

@alexander-melentyev

alexander-melentyev Jun 14, 2021
Author Contributor

I delete changes from .patch files. Thank you!

@alexander-melentyev alexander-melentyev requested a review from bjorn3 Jun 14, 2021
@alexander-melentyev
Copy link
Contributor Author

@alexander-melentyev alexander-melentyev commented Jun 21, 2021

@bjorn3, need your review.

Copy link
Contributor

@bjorn3 bjorn3 left a comment

After you have reverted the indicated change please squash all commits to keep the git history a bit cleaner and avoid polluting the git blame output.

@alexander-melentyev alexander-melentyev force-pushed the alexander-melentyev:spaces branch from 8dd5c97 to e84c9ae Jun 21, 2021
@alexander-melentyev
Copy link
Contributor Author

@alexander-melentyev alexander-melentyev commented Jun 21, 2021

@bjorn3 thank you! All your recommended - done. Please check.

@bjorn3
Copy link
Contributor

@bjorn3 bjorn3 commented Jun 21, 2021

r? @bjorn3

Considering you made changes to .patch files, I'll wait for someone from the @rust-lang/infra team to take a look.

All .patch file and other infra file changes are reverted.

@bors r+ rollup=always

@bors
Copy link
Contributor

@bors bors commented Jun 21, 2021

📌 Commit e84c9ae has been approved by bjorn3

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 21, 2021
Rollup of 9 pull requests

Successful merges:

 - rust-lang#86192 (Make OR_PATTERNS_BACK_COMPAT be a 2021 future-incompatible lint)
 - rust-lang#86248 (Add a regression test for issue-85113)
 - rust-lang#86274 (Spaces)
 - rust-lang#86349 (Add regression test for issue rust-lang#78632)
 - rust-lang#86424 (rustfmt: load nested out-of-line mods correctly)
 - rust-lang#86472 (Fix CI to fetch master on beta channel)
 - rust-lang#86473 (Rustdoc: Account for const-unstable functions)
 - rust-lang#86495 (Improve `proc_macro::{Punct, Spacing}` documentation)
 - rust-lang#86503 (Fix rust.css fonts.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 21, 2021
Rollup of 9 pull requests

Successful merges:

 - rust-lang#86192 (Make OR_PATTERNS_BACK_COMPAT be a 2021 future-incompatible lint)
 - rust-lang#86248 (Add a regression test for issue-85113)
 - rust-lang#86274 (Spaces)
 - rust-lang#86349 (Add regression test for issue rust-lang#78632)
 - rust-lang#86424 (rustfmt: load nested out-of-line mods correctly)
 - rust-lang#86472 (Fix CI to fetch master on beta channel)
 - rust-lang#86473 (Rustdoc: Account for const-unstable functions)
 - rust-lang#86495 (Improve `proc_macro::{Punct, Spacing}` documentation)
 - rust-lang#86503 (Fix rust.css fonts.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 58e7411 into rust-lang:master Jun 21, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jun 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

8 participants