Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ParamEnv section for TypingEnv changes #2265

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,7 @@
- [ADTs and Generic Arguments](./ty_module/generic_arguments.md)
- [Parameter types/consts/regions](./ty_module/param_ty_const_regions.md)
- [`TypeFolder` and `TypeFoldable`](./ty-fold.md)
- [Parameter Environments](./param_env/param_env_summary.md)
- [What is it?](./param_env/param_env_what_is_it.md)
- [How are `ParamEnv`'s constructed internally](./param_env/param_env_construction_internals.md)
- [Which `ParamEnv` do I use?](./param_env/param_env_acquisition.md)
- [Typing/Param Envs](./typing_parameter_envs/typing_parameter_envs.md)
- [Type inference](./type-inference.md)
- [Trait solving](./traits/resolution.md)
- [Higher-ranked trait bounds](./traits/hrtb.md)
Expand Down
2 changes: 1 addition & 1 deletion src/appendix/code-index.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ Item | Kind | Short description | Chapter |
[Emitting Diagnostics]: ../diagnostics.html
[Macro expansion]: ../macro-expansion.html
[Name resolution]: ../name-resolution.html
[Parameter Environment]: ../param_env/param_env_summary.html
[Parameter Environment]: ../typing_parameter_envs/typing_parameter_envs.html
[Trait Solving: Goals and Clauses]: ../traits/goals-and-clauses.html#domain-goals
2 changes: 1 addition & 1 deletion src/const-eval.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ They're the wrappers of the `const_eval` query.
Statics are special; all other functions do not represent statics correctly
and have thus assertions preventing their use on statics.

The `const_eval_*` functions use a [`ParamEnv`](./param_env/param_env_summary.html) of environment
The `const_eval_*` functions use a [`ParamEnv`](./typing_parameter_envs/typing_parameter_envs.html) of environment
in which the constant is evaluated (e.g. the function within which the constant is used)
and a [`GlobalId`]. The `GlobalId` is made up of an `Instance` referring to a constant
or static or of an `Instance` of a function and an index into the function's `Promoted` table.
Expand Down
43 changes: 0 additions & 43 deletions src/param_env/param_env_acquisition.md

This file was deleted.

83 changes: 0 additions & 83 deletions src/param_env/param_env_construction_internals.md

This file was deleted.

18 changes: 0 additions & 18 deletions src/param_env/param_env_summary.md

This file was deleted.

59 changes: 0 additions & 59 deletions src/param_env/param_env_what_is_it.md

This file was deleted.

2 changes: 1 addition & 1 deletion src/traits/caching.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ to be pretty clearly safe and also still retains a very high hit rate
**TODO**: it looks like `pick_candidate_cache` no longer exists. In
general, is this section still accurate at all?

[`ParamEnv`]: ../param_env/param_env_summary.html
[`ParamEnv`]: ../typing_parameter_envs/typing_parameter_envs.html
[`tcx`]: ../ty.html
[#18290]: https://github.com/rust-lang/rust/issues/18290
[#22019]: https://github.com/rust-lang/rust/issues/22019
2 changes: 1 addition & 1 deletion src/traits/resolution.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ in that list. If so, it is considered satisfied. More precisely, we
want to check whether there is a where-clause obligation that is for
the same trait (or some subtrait) and which can match against the obligation.

[parameter environment]: ../param_env/param_env_summary.html
[parameter environment]: ../typing_parameter_envs/typing_parameter_envs.html

Consider this simple example:

Expand Down
Loading