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

Clean up some weird command strings #73315

Merged
merged 1 commit into from
Jun 19, 2020

Conversation

GuillaumeGomez
Copy link
Member

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 13, 2020
@@ -248,8 +247,8 @@ fn opts() -> Vec<RustcOptGroup> {
"e",
"extend-css",
"To add some CSS rules with a given file to generate doc with your \
own theme. However, your theme might break if the rustdoc's generated HTML \
changes, so be careful!",
own theme. However, your theme might break if the rustdoc's generated HTML \
Copy link
Contributor

Choose a reason for hiding this comment

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

Wouldn't this cause the text to have double space?

Copy link
Contributor

Choose a reason for hiding this comment

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

As far as I know the \ above followed by a newline will "eat" all whitespace in the next line(s) until a non-space character, so indenting it more is not an issue.

@kinnison
Copy link
Contributor

A couple of these look like nice cleanups, but some of the reindentation seems arbitrary, it's surely not rustfmt so why the extra indentation?

@GuillaumeGomez
Copy link
Member Author

I tried to pick the "most common" one. But if you have a preference, I'm completely open to it.

@kinnison
Copy link
Contributor

I don't mind, it just felt odd to see them, but if you're balancing them out with other multiline strings elsewhere then that's fine.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 16, 2020

📌 Commit 724dfba has been approved by kinnison

@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 16, 2020
Manishearth added a commit to Manishearth/rust that referenced this pull request Jun 16, 2020
…, r=kinnison

Clean up some weird command strings

r? @kinnison
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jun 17, 2020
…, r=kinnison

Clean up some weird command strings

r? @kinnison
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jun 17, 2020
…, r=kinnison

Clean up some weird command strings

r? @kinnison
tmandry added a commit to tmandry/rust that referenced this pull request Jun 17, 2020
…, r=kinnison

Clean up some weird command strings

r? @kinnison
RalfJung added a commit to RalfJung/rust that referenced this pull request Jun 18, 2020
…, r=kinnison

Clean up some weird command strings

r? @kinnison
Manishearth added a commit to Manishearth/rust that referenced this pull request Jun 18, 2020
…, r=kinnison

Clean up some weird command strings

r? @kinnison
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 19, 2020
…arth

Rollup of 17 pull requests

Successful merges:

 - rust-lang#70551 (Make all uses of ty::Error delay a span bug)
 - rust-lang#71338 (Expand "recursive opaque type" diagnostic)
 - rust-lang#71976 (Improve diagnostics for `let x += 1`)
 - rust-lang#72279 (add raw_ref macros)
 - rust-lang#72628 (Add tests for 'impl Default for [T; N]')
 - rust-lang#72804 (Further tweak lifetime errors involving `dyn Trait` and `impl Trait` in return position)
 - rust-lang#72814 (remove visit_terminator_kind from MIR visitor)
 - rust-lang#72836 (Complete the std::time documentation to warn about the inconsistencies between OS)
 - rust-lang#72968 (Only highlight doc search results via mouseover if mouse has moved)
 - rust-lang#73034 (Export `#[inline]` fns with extern indicators)
 - rust-lang#73315 (Clean up some weird command strings)
 - rust-lang#73320 (Make new type param suggestion more targetted)
 - rust-lang#73361 (Tweak "non-primitive cast" error)
 - rust-lang#73425 (Mention functions pointers in the documentation)
 - rust-lang#73428 (Fix typo in librustc_ast docs)
 - rust-lang#73447 (Improve document for `Result::as_deref(_mut)` methods)
 - rust-lang#73476 (Added tooltip for should_panic code examples)

Failed merges:

r? @ghost
@bors bors merged commit ed92b6a into rust-lang:master Jun 19, 2020
@GuillaumeGomez GuillaumeGomez deleted the clean-up-config-strs branch June 19, 2020 11:24
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
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.

7 participants