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

Fix failing tidy (line endings on Windows) #56418

Merged
merged 1 commit into from
Dec 3, 2018

Conversation

petrochenkov
Copy link
Contributor

Updates to rustc-guide and edition-guide including rust-lang/rustc-dev-guide#246 and rust-lang/edition-guide#122.

@rust-highfive
Copy link
Collaborator

r? @GuillaumeGomez

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

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 1, 2018
@nagisa
Copy link
Member

nagisa commented Dec 1, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Dec 1, 2018

📌 Commit 12c9b79 has been approved by nagisa

@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 Dec 1, 2018
@Centril
Copy link
Contributor

Centril commented Dec 1, 2018

@bors rollup

Centril added a commit to Centril/rust that referenced this pull request Dec 1, 2018
Fix failing tidy (line endings on Windows)

Updates to `rustc-guide` and `edition-guide` including rust-lang/rustc-dev-guide#246 and rust-lang/edition-guide#122.
Centril added a commit to Centril/rust that referenced this pull request Dec 2, 2018
Fix failing tidy (line endings on Windows)

Updates to `rustc-guide` and `edition-guide` including rust-lang/rustc-dev-guide#246 and rust-lang/edition-guide#122.
bors added a commit that referenced this pull request Dec 2, 2018
Rollup of 14 pull requests

Successful merges:

 - #56110 (Consider references and unions potentially inhabited during privacy-respecting inhabitedness checks)
 - #56305 (update miri)
 - #56366 (Stabilize self_in_typedefs feature)
 - #56372 (Refer to the second borrow as the "second borrow" in E0501.rs)
 - #56394 (Deal with EINTR in net timeout tests)
 - #56395 (Stabilize dbg!(...))
 - #56401 (Move VecDeque::resize_with out of the impl<T:Clone> block)
 - #56402 (Improve the unstable book example for #[marker] trait)
 - #56412 (Update tracking issue for `extern_crate_self`)
 - #56416 (Remove unneeded body class selector)
 - #56418 (Fix failing tidy (line endings on Windows))
 - #56419 (Remove some uses of try!)
 - #56424 (Mention raw-ident syntax)
 - #56432 (Update issue number of `shrink_to` methods to point the tracking issue)

Failed merges:

r? @ghost
@pietroalbini
Copy link
Member

@bors rollup-

kennytm added a commit to kennytm/rust that referenced this pull request Dec 3, 2018
Fix failing tidy (line endings on Windows)

Updates to `rustc-guide` and `edition-guide` including rust-lang/rustc-dev-guide#246 and rust-lang/edition-guide#122.
bors added a commit that referenced this pull request Dec 3, 2018
Rollup of 13 pull requests

Successful merges:

 - #56141 ([std] Osstr len clarity)
 - #56366 (Stabilize self_in_typedefs feature)
 - #56395 (Stabilize dbg!(...))
 - #56401 (Move VecDeque::resize_with out of the impl<T:Clone> block)
 - #56402 (Improve the unstable book example for #[marker] trait)
 - #56412 (Update tracking issue for `extern_crate_self`)
 - #56416 (Remove unneeded body class selector)
 - #56418 (Fix failing tidy (line endings on Windows))
 - #56419 (Remove some uses of try!)
 - #56432 (Update issue number of `shrink_to` methods to point the tracking issue)
 - #56433 (Add description about `crate` for parse_visibility's comment)
 - #56435 (make the C part of compiler-builtins opt-out)
 - #56438 (Remove not used `DotEq` token)

Failed merges:

r? @ghost
@bors bors merged commit 12c9b79 into rust-lang:master Dec 3, 2018
@petrochenkov petrochenkov deleted the wintidy branch June 5, 2019 16:24
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