about summary refs log tree commit diff
path: root/src/doc/rustc-dev-guide
diff options
context:
space:
mode:
authorgftea <1705787+gftea@users.noreply.github.com>2023-01-17 23:46:14 +0100
committerGitHub <noreply@github.com>2023-01-18 07:46:14 +0900
commit2c0ea01426a2c7fb09dddf4ad7546c01d0b2a24a (patch)
tree11d3b6a1c56606b7e282ca45189cc3f6fb6bf9ed /src/doc/rustc-dev-guide
parent9ea003f7c8d2ffdc378b12ab217b1192c1279000 (diff)
downloadrust-2c0ea01426a2c7fb09dddf4ad7546c01d0b2a24a.tar.gz
rust-2c0ea01426a2c7fb09dddf4ad7546c01d0b2a24a.zip
Update resolution.md (#1561)
Diffstat (limited to 'src/doc/rustc-dev-guide')
-rw-r--r--src/doc/rustc-dev-guide/src/traits/resolution.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/rustc-dev-guide/src/traits/resolution.md b/src/doc/rustc-dev-guide/src/traits/resolution.md
index 9cf753b199d..639ebbdec22 100644
--- a/src/doc/rustc-dev-guide/src/traits/resolution.md
+++ b/src/doc/rustc-dev-guide/src/traits/resolution.md
@@ -163,7 +163,7 @@ impl<T: Get> Get for Box<T> {
 }
 ```
 
-What happens when we invoke `get_it(&Box::new(1_u16))`, for example? In this
+What happens when we invoke `get(&Box::new(1_u16))`, for example? In this
 case, the `Self` type is `Box<u16>` – that unifies with both impls,
 because the first applies to all types `T`, and the second to all
 `Box<T>`. In order for this to be unambiguous, the compiler does a *winnowing*
@@ -248,7 +248,7 @@ because we know that each resolution will resolve to a particular impl.
 
 One interesting twist has to do with nested obligations. In general, in codegen,
 we only to figure out which candidate applies, we do not care about nested obligations,
-as these are already assumed to be true. Nonetheless, we *do* currently do fulfill all of them.
+as these are already assumed to be true. Nonetheless, we *do* currently fulfill all of them.
 That is because it can sometimes inform the results of type inference.
 That is, we do not have the full substitutions in terms of the type variables
 of the impl available to us, so we must run trait selection to figure