Skip to content

Commit

Permalink
Merge pull request #2 from rust-lang/master
Browse files Browse the repository at this point in the history
Merge pull request rust-lang#2092 from Aleru/master
  • Loading branch information
fengjixuchui authored Oct 15, 2019
2 parents c58e8b9 + 9bb8b16 commit 8ea2b06
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions src/appendix-04-useful-development-tools.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Appendix D - Useful Development Tools
## Appendix D - Useful Development Tools

In this appendix, we talk about some useful development tools that the Rust
project provides. We’ll look at automatic formatting, quick ways to apply
warning fixes, a linter, and integrating with IDEs.

## Automatic Formatting with `rustfmt`
### Automatic Formatting with `rustfmt`

The `rustfmt` tool reformats your code according to the community code style.
Many collaborative projects use `rustfmt` to prevent arguments about which
Expand All @@ -29,7 +29,7 @@ on `rustfmt`, see [its documentation][rustfmt].

[rustfmt]: /~https://github.com/rust-lang/rustfmt

## Fix Your Code with `rustfix`
### Fix Your Code with `rustfix`

The rustfix tool is included with Rust installations and can automatically fix
some compiler warnings. If you’ve written code in Rust, you’ve probably seen
Expand Down Expand Up @@ -96,7 +96,7 @@ The `for` loop variable is now named `_i`, and the warning no longer appears.
You can also use the `cargo fix` command to transition your code between
different Rust editions. Editions are covered in Appendix E.

## More Lints with Clippy
### More Lints with Clippy

The Clippy tool is a collection of lints to analyze your code so you can catch
common mistakes and improve your Rust code.
Expand Down Expand Up @@ -158,7 +158,7 @@ For more information on Clippy, see [its documentation][clippy].

[clippy]: /~https://github.com/rust-lang/rust-clippy

## IDE Integration Using the Rust Language Server
### IDE Integration Using the Rust Language Server

To help IDE integration, the Rust project distributes the *Rust Language
Server* (`rls`). This tool speaks the [Language Server
Expand Down
2 changes: 1 addition & 1 deletion src/appendix-05-editions.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Appendix E - Editions
## Appendix E - Editions

In Chapter 1, you saw that `cargo new` adds a bit of metadata to your
*Cargo.toml* file about an edition. This appendix talks about what that means!
Expand Down
2 changes: 1 addition & 1 deletion src/appendix-07-nightly-rust.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Appendix G - How Rust is Made and “Nightly Rust”
## Appendix G - How Rust is Made and “Nightly Rust”

This appendix is about how Rust is made and how that affects you as a Rust
developer.
Expand Down
2 changes: 1 addition & 1 deletion src/ch07-05-separating-modules-into-different-files.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ that module.

## Summary

Rust lets you organize your packages into crates and your crates into modules
Rust lets you split a package into multiple crates and a crate into modules
so you can refer to items defined in one module from another module. You can do
this by specifying absolute or relative paths. These paths can be brought into
scope with a `use` statement so you can use a shorter path for multiple uses of
Expand Down

0 comments on commit 8ea2b06

Please sign in to comment.