diff options
| author | Santiago Pastorino <spastorino@gmail.com> | 2021-03-10 11:56:51 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-10 23:56:51 +0900 |
| commit | 7268344274da337ef0acbe61ba768694a57b4118 (patch) | |
| tree | d89bd891cb6ba29bf38809a49fb42f180905e81a /src/doc/rustc-dev-guide | |
| parent | b818c60727459c2df57319eee4c9a28c01691c01 (diff) | |
| download | rust-7268344274da337ef0acbe61ba768694a57b4118.tar.gz rust-7268344274da337ef0acbe61ba768694a57b4118.zip | |
Fix typos (#1079)
Diffstat (limited to 'src/doc/rustc-dev-guide')
| -rw-r--r-- | src/doc/rustc-dev-guide/src/borrow_check/region_inference/placeholders_and_universes.md | 2 | ||||
| -rw-r--r-- | src/doc/rustc-dev-guide/src/contributing.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/rustc-dev-guide/src/borrow_check/region_inference/placeholders_and_universes.md b/src/doc/rustc-dev-guide/src/borrow_check/region_inference/placeholders_and_universes.md index 20775038be4..e1c28ba4c54 100644 --- a/src/doc/rustc-dev-guide/src/borrow_check/region_inference/placeholders_and_universes.md +++ b/src/doc/rustc-dev-guide/src/borrow_check/region_inference/placeholders_and_universes.md @@ -21,7 +21,7 @@ fn main() { ``` This program ought not to type-check: `foo` needs a static reference -for its argument, and `bar` wants to be given a function that that +for its argument, and `bar` wants to be given a function that accepts **any** reference (so it can call it with something on its stack, for example). But *how* do we reject it and *why*? diff --git a/src/doc/rustc-dev-guide/src/contributing.md b/src/doc/rustc-dev-guide/src/contributing.md index d0c77edf26b..9db77fcb613 100644 --- a/src/doc/rustc-dev-guide/src/contributing.md +++ b/src/doc/rustc-dev-guide/src/contributing.md @@ -191,7 +191,7 @@ git subtree pull -P src/tools/clippy https://github.com/rust-lang/rust-clippy ma ``` takes all changes since the last `subtree pull` from the tool repo -repo and adds these commits to the rustc repo + a merge commit that moves the tool changes into +and adds these commits to the rustc repo + a merge commit that moves the tool changes into the specified directory in the rust repository. It is recommended that you always do a push first and get that merged to the tool master branch. |