mirror
/
rustc-dev-guide
mirror of https://github.com/rust-lang/rustc-dev-guide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #99 from dlrobertson/master 

Minor grammar and syntax fixes
This commit is contained in:
Jake Goulding 2018-03-25 12:30:37 -04:00 committed by GitHub
parent 6723308d21 52520205a3
commit de78b4e69e
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/trait-caching.md
View File

@ -54,7 +54,7 @@ use is done by the method `pick_candidate_cache` in `select.rs`. At
the moment, we use a very simple, conservative rule: if there are any the moment, we use a very simple, conservative rule: if there are any
where-clauses in scope, then we use the local cache. We used to try where-clauses in scope, then we use the local cache. We used to try
and draw finer-grained distinctions, but that led to a serious of and draw finer-grained distinctions, but that led to a serious of
annoying and weird bugs like #22019 and #18290. This simple rule seems annoying and weird bugs like [#22019] and [#18290]. This simple rule seems
to be pretty clearly safe and also still retains a very high hit rate to be pretty clearly safe and also still retains a very high hit rate
(~95% when compiling rustc). (~95% when compiling rustc).
@ -63,3 +63,5 @@ general, is this section still accurate at all?
[`ParamEnv`]: ./param_env.html [`ParamEnv`]: ./param_env.html
[`tcx`]: ./ty.html [`tcx`]: ./ty.html
[#18290]: https://github.com/rust-lang/rust/issues/18290
[#22019]: https://github.com/rust-lang/rust/issues/22019

2
src/traits-associated-types.md
View File

@ -20,6 +20,8 @@ that syntax is expanded during
["type collection"](./type-checking.html) into the explicit form, ["type collection"](./type-checking.html) into the explicit form,
though that is something we may want to change in the future.) though that is something we may want to change in the future.)
[intoiter-item]: https://doc.rust-lang.org/nightly/core/iter/trait.IntoIterator.html#associatedtype.Item
<a name=normalize> <a name=normalize>
In some cases, associated type projections can be **normalized** -- In some cases, associated type projections can be **normalized** --

2
src/type-inference.md
View File

@ -84,7 +84,7 @@ below in a separate section.
The most basic operations you can perform in the type inferencer is The most basic operations you can perform in the type inferencer is
**equality**, which forces two types `T` and `U` to be the same. The **equality**, which forces two types `T` and `U` to be the same. The
recommended way to add an equality constraint is using the `at` recommended way to add an equality constraint is to use the `at`
method, roughly like so: method, roughly like so:
```rust ```rust