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

sashamelentyev
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

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

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.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 13, 2021
@GuillaumeGomez
Copy link
Member

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

@sashamelentyev
Copy link
Contributor Author

You are welcome! Why not?

@GuillaumeGomez
Copy link
Member

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.

@sashamelentyev
Copy link
Contributor Author

Ok

@calebcartwright
Copy link
Member

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?

@sashamelentyev
Copy link
Contributor Author

sashamelentyev 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

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I delete changes from .patch files. Thank you!

@sashamelentyev
Copy link
Contributor Author

@bjorn3, need your review.

Copy link
Member

@bjorn3 bjorn3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@sashamelentyev
Copy link
Contributor Author

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

@bjorn3
Copy link
Member

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 commented Jun 21, 2021

📌 Commit e84c9ae has been approved by bjorn3

@bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 21, 2021
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
flip1995 pushed a commit to flip1995/rust that referenced this pull request Jul 1, 2021
calebcartwright pushed a commit to calebcartwright/rust that referenced this pull request Jul 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants