Skip to content

Update rustc-guide to rustc-dev-guide #344

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
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
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ machinery inside of chalk.
In addition to the blog posts there is a [glossary](GLOSSARY.md) explaining some
of the terminology used in chalk.

### Trait solving in rustc guide
The rustc guide describes [new-style trait solving][trait-solving], which is slowly replacing the old trait resolution.
### Trait solving in rustc-dev-guide
The rustc-dev-guide describes [new-style trait solving][trait-solving], which is slowly replacing the old trait resolution.

[trait-solving]: https://rust-lang.github.io/rustc-guide/traits/index.html
[trait-solving]: https://rustc-dev-guide.rust-lang.org/traits/index.html
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ the compiler, but also for experimentation.

## FAQ

**How does chalk relate to rustc?** The plan is to have rustc use the `chalk-engine` crate (in this repo), which defines chalk's solver. The rest of chalk can then be considered an elaborate unit testing harness. For more details, see [the Traits chapter of the rustc-guide](https://rust-lang.github.io/rustc-guide/traits/index.html).
**How does chalk relate to rustc?** The plan is to have rustc use the `chalk-engine` crate (in this repo), which defines chalk's solver. The rest of chalk can then be considered an elaborate unit testing harness. For more details, see [the Traits chapter of the rustc-dev-guide](https://rustc-dev-guide.rust-lang.org/traits/index.html).

**Where does the name come from?** `chalk` is named after [Chalkidiki], the area where [Aristotle] was
born. Since Prolog is a logic programming language, this seemed a
Expand Down
4 changes: 2 additions & 2 deletions chalk-engine/src/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ pub trait Context: Clone + Debug {

/// A canonicalized `GoalInEnvironment` -- that is, one where all
/// free inference variables have been bound into the canonical
/// binder. See [the rustc-guide] for more information.
/// binder. See [the rustc-dev-guide] for more information.
///
/// [the rustc-guide]: https://rust-lang.github.io/rustc-guide/traits/canonicalization.html
/// [the rustc-dev-guide]: https://rustc-dev-guide.rust-lang.org/traits/canonicalization.html
type CanonicalGoalInEnvironment: Debug;

/// A u-canonicalized `GoalInEnvironment` -- this is one where the
Expand Down
4 changes: 2 additions & 2 deletions chalk-engine/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//! An alternative solver based around the SLG algorithm, which
//! implements the well-formed semantics. For an overview of how the solver
//! works, see [The On-Demand SLG Solver][guide] in the rustc guide.
//! works, see [The On-Demand SLG Solver][guide] in the rustc-dev-guide.
//!
//! [guide]: https://rust-lang.github.io/rustc-guide/traits/slg.html
//! [guide]: https://rustc-dev-guide.rust-lang.org/traits/slg.html
//!
//! This algorithm is very closed based on the description found in the
//! following paper, which I will refer to in the comments as EWFS:
Expand Down
2 changes: 1 addition & 1 deletion chalk-ir/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ pub enum TypeName<I: Interner> {
/// `forall<T> { Goal(T) }` (syntactical representation)
/// `forall { Goal(?0) }` (used a DeBruijn index)
/// `Goal(!U1)` (the quantifier was moved to the environment and replaced with a universe index)
/// See https://rust-lang.github.io/rustc-guide/borrow_check/region_inference.html#placeholders-and-universes for more.
/// See https://rustc-dev-guide.rust-lang.org/borrow_check/region_inference.html#placeholders-and-universes for more.
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct UniverseIndex {
pub counter: usize,
Expand Down