1
0
mirror of https://github.com/google/comprehensive-rust.git synced 2025-07-07 06:55:42 +02:00

Format all Markdown files with dprint (#1157)

This is the result of running `dprint fmt` after removing `src/` from
the list of excluded directories.

This also reformats the Rust code: we might want to tweak this a bit in
the future since some of the changes removes the hand-formatting. Of
course, this formatting can be seen as a mis-feature, so maybe this is
good overall.

Thanks to mdbook-i18n-helpers 0.2, the POT file is nearly unchanged
after this, meaning that all existing translations remain valid! A few
messages were changed because of stray whitespace characters:

     msgid ""
     "Slices always borrow from another object. In this example, `a` has to remain "
    -"'alive' (in scope) for at least as long as our slice. "
    +"'alive' (in scope) for at least as long as our slice."
     msgstr ""

The formatting is enforced in CI and we will have to see how annoying
this is in practice for the many contributors. If it becomes annoying,
we should look into fixing dprint/check#11 so that `dprint` can annotate
the lines that need fixing directly, then I think we can consider more
strict formatting checks.

I added more customization to `rustfmt.toml`. This is to better emulate
the dense style used in the course:

- `max_width = 85` allows lines to take up the full width available in
our code blocks (when taking margins and the line numbers into account).
- `wrap_comments = true` ensures that we don't show very long comments
in the code examples. I edited some comments to shorten them and avoid
unnecessary line breaks — please trim other unnecessarily long comments
when you see them! Remember we're writing code for slides 😄
- `use_small_heuristics = "Max"` allows for things like struct literals
and if-statements to take up the full line width configured above.

The formatting settings apply to all our Rust code right now — I think
we could improve this with https://github.com/dprint/dprint/issues/711
which lets us add per-directory `dprint` configuration files. However,
the `inherit: true` setting is not yet implemented (as far as I can
tell), so a nested configuration file will have to copy most or all of
the top-level file.
This commit is contained in:
Martin Geisler
2023-12-31 00:15:07 +01:00
committed by GitHub
parent f43e72e0ad
commit c9f66fd425
302 changed files with 3067 additions and 2622 deletions

View File

@ -4,8 +4,8 @@ minutes: 10
# use, super, self
A module can bring symbols from another module into scope with `use`.
You will typically see something like this at the top of each module:
A module can bring symbols from another module into scope with `use`. You will
typically see something like this at the top of each module:
```rust,editable
use std::collections::HashSet;
@ -17,16 +17,16 @@ use std::process::abort;
Paths are resolved as follows:
1. As a relative path:
* `foo` or `self::foo` refers to `foo` in the current module,
* `super::foo` refers to `foo` in the parent module.
- `foo` or `self::foo` refers to `foo` in the current module,
- `super::foo` refers to `foo` in the parent module.
2. As an absolute path:
* `crate::foo` refers to `foo` in the root of the current crate,
* `bar::foo` refers to `foo` in the `bar` crate.
- `crate::foo` refers to `foo` in the root of the current crate,
- `bar::foo` refers to `foo` in the `bar` crate.
<details>
* It is common to "re-export" symbols at a shorter path. For example, the
- It is common to "re-export" symbols at a shorter path. For example, the
top-level `lib.rs` in a crate might have
```rust,ignore
@ -39,14 +39,14 @@ Paths are resolved as follows:
making `DiskStorage` and `NetworkStorage` available to other crates with a
convenient, short path.
* For the most part, only items that appear in a module need to be `use`'d.
However, a trait must be in scope to call any methods on that trait, even if
a type implementing that trait is already in scope. For example, to use the
- For the most part, only items that appear in a module need to be `use`'d.
However, a trait must be in scope to call any methods on that trait, even if a
type implementing that trait is already in scope. For example, to use the
`read_to_string` method on a type implementing the `Read` trait, you need to
`use std::io::Read`.
* The `use` statement can have a wildcard: `use std::io::*`. This is
discouraged because it is not clear which items are imported, and those might
change over time.
- The `use` statement can have a wildcard: `use std::io::*`. This is discouraged
because it is not clear which items are imported, and those might change over
time.
</details>