From b41dc4950343ce2249ae39a9634312b2d59d289f Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Tue, 5 May 2020 16:58:58 -0400 Subject: [PATCH] Fix some broken rustc-dev-guide links --- CONTRIBUTING.md | 2 +- README.md | 4 +++- chalk-engine/src/context.rs | 4 ++-- chalk-engine/src/lib.rs | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2a742463d8f..032f4145bbb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -92,4 +92,4 @@ of the terminology used in chalk. ### 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://rustc-dev-guide.rust-lang.org/traits/index.html +[trait-solving]: https://rustc-dev-guide.rust-lang.org/traits/chalk.html diff --git a/README.md b/README.md index 1d912941c8d..87786dc4f3b 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,9 @@ See the [Chalk book](https://rust-lang.github.io/chalk/book/) for more informati ## 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-dev-guide](https://rustc-dev-guide.rust-lang.org/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 +[this chapter of the rustc-dev-guide](https://rustc-dev-guide.rust-lang.org/traits/chalk.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 diff --git a/chalk-engine/src/context.rs b/chalk-engine/src/context.rs index f589e6d4210..6bb02166660 100644 --- a/chalk-engine/src/context.rs +++ b/chalk-engine/src/context.rs @@ -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-dev-guide] for more information. + /// binder. See [the chalk book] for more information. /// - /// [the rustc-dev-guide]: https://rustc-dev-guide.rust-lang.org/traits/canonicalization.html + /// [the chalk book]: https://rust-lang.github.io/chalk/book/canonical_queries/canonicalization.html type CanonicalGoalInEnvironment: Debug; /// A u-canonicalized `GoalInEnvironment` -- this is one where the diff --git a/chalk-engine/src/lib.rs b/chalk-engine/src/lib.rs index ce08df8153d..3923b8c8a34 100644 --- a/chalk-engine/src/lib.rs +++ b/chalk-engine/src/lib.rs @@ -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-dev-guide. +//! works, see [The On-Demand SLG Solver][guide] in the chalk book. //! -//! [guide]: https://rustc-dev-guide.rust-lang.org/traits/slg.html +//! [guide]: https://rust-lang.github.io/chalk/book/engine/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: