Skip to content

Commit 19f7d2e

Browse files
authored
Rename resolvers following the latest rustc change (#776)
1 parent 2c6f176 commit 19f7d2e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/macro-expansion.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ whole crate, like we normally do).
154154
### Other Data Structures
155155

156156
Here are some other notable data structures involved in expansion and integration:
157-
- [`Resolver`] - a trait used to break crate dependencies. This allows the
157+
- [`ResolverExpand`] - a trait used to break crate dependencies. This allows the
158158
resolver services to be used in [`rustc_ast`], despite [`rustc_resolve`] and
159159
pretty much everything else depending on [`rustc_ast`].
160160
- [`ExtCtxt`]/[`ExpansionData`] - various intermediate data kept and used by expansion
@@ -168,7 +168,7 @@ Here are some other notable data structures involved in expansion and integratio
168168

169169
[`rustc_ast`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_ast/index.html
170170
[`rustc_resolve`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_resolve/index.html
171-
[`Resolver`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_expand/base/trait.Resolver.html
171+
[`ResolverExpand`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_expand/base/trait.ResolverExpand.html
172172
[`ExtCtxt`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_expand/base/struct.ExtCtxt.html
173173
[`ExpansionData`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_expand/base/struct.ExpansionData.html
174174
[`Annotatable`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_expand/base/enum.Annotatable.html

src/name-resolution.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ namespaces and therefore can co-exist.
4343
The name resolution in Rust is a two-phase process. In the first phase, which runs
4444
during macro expansion, we build a tree of modules and resolve imports. Macro
4545
expansion and name resolution communicate with each other via the
46-
[`Resolver`] trait.
46+
[`ResolverAstLowering`] trait.
4747

4848
The input to the second phase is the syntax tree, produced by parsing input
4949
files and expanding macros. This phase produces links from all the names in the
@@ -59,7 +59,7 @@ The name resolution lives in the `librustc_resolve` crate, with the meat in
5959
`lib.rs` and some helpers or symbol-type specific logic in the other modules.
6060

6161
[`Resolver::resolve_crate`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_resolve/struct.Resolver.html#method.resolve_crate
62-
[`Resolver`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_ast_lowering/trait.Resolver.html
62+
[`ResolverAstLowering`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_ast_lowering/trait.ResolverAstLowering.html
6363

6464
## Namespaces
6565

0 commit comments

Comments
 (0)