From 2605eae52618257716bfb6505b97032871fc70e6 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Wed, 10 Mar 2021 11:41:32 -0300 Subject: [PATCH 1/2] Remove extra repo --- src/contributing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/contributing.md b/src/contributing.md index 4a1994986..920e454f8 100644 --- a/src/contributing.md +++ b/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. From ff89d38d950f5a0ea24fa07f2dce737ddfcb10bd Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Wed, 10 Mar 2021 11:42:57 -0300 Subject: [PATCH 2/2] Remove extra that --- src/borrow_check/region_inference/placeholders_and_universes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/borrow_check/region_inference/placeholders_and_universes.md b/src/borrow_check/region_inference/placeholders_and_universes.md index 20775038b..e1c28ba4c 100644 --- a/src/borrow_check/region_inference/placeholders_and_universes.md +++ b/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*?