Skip to content

Gramar, and spelin kleanup #10487

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

Merged
merged 1 commit into from
Mar 31, 2023
Merged

Gramar, and spelin kleanup #10487

merged 1 commit into from
Mar 31, 2023

Conversation

nyurik
Copy link
Contributor

@nyurik nyurik commented Mar 11, 2023

A few minor cleanups in various markdown files, mostly focusing on spelling and ignoring non-compilable codeblocks. Also a few markdown tables, etc.

P.S. I'm no grammar expert, do take with a grain of salt.

changelog: none

@rustbot
Copy link
Collaborator

rustbot commented Mar 11, 2023

r? @dswij

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Mar 11, 2023
Copy link
Member

@xFrednet xFrednet left a comment

Choose a reason for hiding this comment

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

One small question, while skimming over the changes :)

@@ -192,7 +192,7 @@ functions to deal with macros:
- `span.from_expansion()`: detects if a span is from macro expansion or
desugaring. Checking this is a common first step in a lint.

```rust
```rust,ignore
Copy link
Member

Choose a reason for hiding this comment

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

The ignore flag is AFAIK only used by rustdoc, I know that there are tools to also run the code in md book, though. Is there a reason why you think it's better to add them? For me, it seems like this expects a certain type of markdown to be used and makes it less compatible for little reason 🤔

The rendering seems to work on GH just fine either way:

let x = 0;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@xFrednet oops, just saw your reply, thx for patience :) The reason I added it there was because some IDEs (and most like all IDEs in the future) treat any code inside the triple backticks as valid code, and try to help with it. In this case, the code is incorrect (e.g. it has a tripple dot instead of a real code: fn main() { ... }) -- which means IDEs show it as an error.

@bors
Copy link
Contributor

bors commented Mar 30, 2023

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

@dswij
Copy link
Member

dswij commented Mar 30, 2023

@bors r+

Thank you @xFrednet for the review

@bors
Copy link
Contributor

bors commented Mar 30, 2023

📌 Commit 9860760 has been approved by dswij

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Mar 30, 2023

⌛ Testing commit 9860760 with merge 26b5d62...

bors added a commit that referenced this pull request Mar 30, 2023
Gramar, and spelin kleanup

A few minor cleanups in various markdown files, mostly focusing on spelling and ignoring non-compilable codeblocks. Also a few markdown tables, etc.

P.S. I'm no grammar expert, do take with a grain of salt.
@bors
Copy link
Contributor

bors commented Mar 30, 2023

💔 Test failed - checks-action_test

@xFrednet
Copy link
Member

The usual changelog complaint xD

@bors retry

@bors
Copy link
Contributor

bors commented Mar 30, 2023

⌛ Testing commit 9860760 with merge f610f8d...

bors added a commit that referenced this pull request Mar 30, 2023
Gramar, and spelin kleanup

A few minor cleanups in various markdown files, mostly focusing on spelling and ignoring non-compilable codeblocks. Also a few markdown tables, etc.

P.S. I'm no grammar expert, do take with a grain of salt.

changelog: none
@bors
Copy link
Contributor

bors commented Mar 30, 2023

💔 Test failed - checks-action_test

Comment on lines -198 to 199
default configuration of Clippy. By default any configuration will replace the default value.
default configuration of Clippy. By default, any configuration will replace the default value.

Copy link
Member

Choose a reason for hiding this comment

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

This file is auto generated, from the doc comments in clippy_lints::util::conf. You can update the strings there and then run cargo collect-metadata that should update this file and make bors happy :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks @xFrednet , fixed. Storing auto-generated content in git is evil... but alas.

A few minor cleanups in various markdown files, mostly focusing on spelling and ignoring non-compilable codeblocks.
@nyurik
Copy link
Contributor Author

nyurik commented Mar 30, 2023

@dswij or @xFrednet can you re-bors it please?

@dswij
Copy link
Member

dswij commented Mar 30, 2023

@bors retry

@nyurik
Copy link
Contributor Author

nyurik commented Mar 30, 2023

@dswij I think you need to bors r+ it

@dswij
Copy link
Member

dswij commented Mar 31, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Mar 31, 2023

📌 Commit 41b367f has been approved by dswij

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Mar 31, 2023

⌛ Testing commit 41b367f with merge 89160b6...

@bors
Copy link
Contributor

bors commented Mar 31, 2023

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: dswij
Pushing 89160b6 to master...

@bors bors merged commit 89160b6 into rust-lang:master Mar 31, 2023
@nyurik nyurik deleted the readme-fixes branch April 2, 2023 18:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants