Skip to content

Commit 6ea7b0d

Browse files
JohnTitortshepang
authored andcommitted
Address the change in rust-lang/rust#106718
Signed-off-by: Yuki Okushi <[email protected]>
1 parent 6213fc1 commit 6ea7b0d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/solve/trait-solving.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ have to prove and the `param_env` in which this predicate has to hold.
2929
We prove goals by checking whether each possible [`Candidate`] applies for the given goal by
3030
recursively proving its nested goals. For a list of possible candidates with examples, look at
3131
[`CandidateSource`]. The most important candidates are `Impl` candidates, i.e. trait implementations
32-
written by the user, and `ParamEnv` candidates, i.e. assumptions in our current environment.
32+
written by the user, and `ParamEnv` candidates, i.e. assumptions in our current environment.
3333

3434
Looking at the above example, to prove `Vec<T>: Clone` we first use
3535
`impl<T: Clone> Clone for Vec<T>`. To use this impl we have to prove the nested
@@ -64,7 +64,7 @@ We can however get overflow as in the following snippet:
6464
fn foo<T: Trait>(x: )
6565
```
6666

67-
### 3. Trait goals in empty environments are proven by a unique impl.
67+
### 3. Trait goals in empty environments are proven by a unique impl
6868

6969
If a trait goal holds with an empty environment, there is a unique `impl`,
7070
either user-defined or builtin, which is used to prove that goal.
@@ -110,5 +110,5 @@ Two types being equal in the type system must mean that they have the same `Type
110110
[`Goal`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_trait_selection/solve/struct.Goal.html
111111
[`Predicate`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/struct.Predicate.html
112112
[`Candidate`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_trait_selection/solve/assembly/struct.Candidate.html
113-
[`CandidateSource`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_trait_selection/solve/trait_goals/enum.CandidateSource.html
114-
[`CanonicalResponse`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_trait_selection/solve/type.CanonicalResponse.html
113+
[`CandidateSource`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_trait_selection/solve/assembly/enum.CandidateSource.html
114+
[`CanonicalResponse`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_trait_selection/solve/type.CanonicalResponse.html

0 commit comments

Comments
 (0)