Skip to content

Rollup of 9 pull requests #69931

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

Closed
wants to merge 37 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
35c4aae
Added tvOS as a backend
simlay Jan 11, 2020
a266169
Merge branch 'master' of github.com:rust-lang/rust into add-tvSO-target
Feb 14, 2020
6b17330
Merged apple_tvos_base and apple_ios_base into apple_sdk_base.
Feb 15, 2020
2599771
fmt
Feb 20, 2020
0e1cd59
Toolstate: remove redundant beta-week check.
ehuss Mar 4, 2020
a6d8c9c
more toolstate comments
RalfJung Mar 4, 2020
a41f1f1
Further clarifications and comments on toolstate operation.
ehuss Mar 4, 2020
91525fd
Tweak output for invalid negative impl AST errors
estebank Mar 5, 2020
713a291
review comments
estebank Mar 5, 2020
3d146a3
Document unsafe blocks in core::fmt
foeb Feb 10, 2020
6fba412
Further tweak spans in ast validation errors
estebank Mar 6, 2020
005fc6e
Suggest removal of auto trait super traits and type params
estebank Mar 6, 2020
f483032
review comment
estebank Mar 6, 2020
4897594
miri: ICE on invalid terminators
RalfJung Mar 8, 2020
8a8870f
miri: add machine hook for Abort terminator
RalfJung Mar 9, 2020
911c75f
also handle abort intrinsic with new machine hook
RalfJung Mar 9, 2020
0037f4e
Rename rustc-guide to rustc-dev-guide
spastorino Mar 6, 2020
9d4fdba
Rename rustc guide to rustc dev guide
spastorino Mar 5, 2020
1ddcea3
Rename rustc_guide to rustc_dev_guide
spastorino Mar 6, 2020
d00b269
Rename Rustc Guide to Rustc Dev Guide
spastorino Mar 6, 2020
b3b32b7
rust-lang.github.io/rustc-dev-guide -> rustc-dev-guide.rust-lang.org
spastorino Mar 9, 2020
29be741
review comments
estebank Mar 11, 2020
cdc7304
Compute the correct layout for variants of uninhabited enums and read…
oli-obk Mar 6, 2020
ec88ffa
Comment nits
oli-obk Mar 11, 2020
3244c84
rustdoc: remove unused import
matthiaskrgr Mar 11, 2020
74608c7
Rustfmt and adjust capitalization
oli-obk Mar 11, 2020
7ee1b47
review comments
estebank Mar 11, 2020
bbafe47
ci: bump webrender in cargotest
pietroalbini Mar 11, 2020
37e967f
Rollup merge of #68191 - simlay:add-tvSO-target, r=nagisa
Centril Mar 11, 2020
d839de9
Rollup merge of #69011 - foeb:document-unsafe-core-fmt, r=Mark-Simula…
Centril Mar 11, 2020
9381b8b
Rollup merge of #69705 - ehuss:toolstate-remove-redundant-beta, r=Mar…
Centril Mar 11, 2020
3681df6
Rollup merge of #69722 - estebank:negative-impl-span-ast, r=Centril
Centril Mar 11, 2020
e10e6f0
Rollup merge of #69747 - spastorino:rename-rustc-guide, r=pietroalbini
Centril Mar 11, 2020
7210c6c
Rollup merge of #69768 - oli-obk:union_field_ice, r=eddyb,RalfJung
Centril Mar 11, 2020
75429bc
Rollup merge of #69830 - RalfJung:miri-invalid-terminator, r=oli-obk
Centril Mar 11, 2020
855e79a
Rollup merge of #69921 - matthiaskrgr:rustdoc_import, r=Centril
Centril Mar 11, 2020
3002bd2
Rollup merge of #69928 - pietroalbini:bump-cargotest-webrender, r=Mar…
Centril Mar 11, 2020
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
Prev Previous commit
Next Next commit
rust-lang.github.io/rustc-dev-guide -> rustc-dev-guide.rust-lang.org
  • Loading branch information
spastorino committed Mar 10, 2020
commit b3b32b74bcc767aae694c473e87d10cee9d0aff3
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/tracking_issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ for larger features an implementation could be broken up into multiple PRs.
- [ ] Adjust documentation ([see instructions on rustc-dev-guide][doc-guide])
- [ ] Stabilization PR ([see instructions on rustc-dev-guide][stabilization-guide])

[stabilization-guide]: https://rust-lang.github.io/rustc-dev-guide/stabilization_guide.html#stabilization-pr
[doc-guide]: https://rust-lang.github.io/rustc-dev-guide/stabilization_guide.html#documentation-prs
[stabilization-guide]: https://rustc-dev-guide.rust-lang.org/stabilization_guide.html#stabilization-pr
[doc-guide]: https://rustc-dev-guide.rust-lang.org/stabilization_guide.html#documentation-prs

### Unresolved Questions
<!--
Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ can give you a good example of how a typical contribution would go.
[rust-discord]: http://discord.gg/rust-lang
[rust-zulip]: https://rust-lang.zulipchat.com
[coc]: https://www.rust-lang.org/conduct.html
[rustc-dev-guide]: https://rust-lang.github.io/rustc-dev-guide/
[walkthrough]: https://rust-lang.github.io/rustc-dev-guide/walkthrough.html
[rustc-dev-guide]: https://rustc-dev-guide.rust-lang.org/
[walkthrough]: https://rustc-dev-guide.rust-lang.org/walkthrough.html

## Feature Requests
[feature-requests]: #feature-requests
Expand Down Expand Up @@ -108,7 +108,7 @@ contributions to the compiler and the standard library. It also lists some
really useful commands to the build system (`./x.py`), which could save you a
lot of time.

[rustcguidebuild]: https://rust-lang.github.io/rustc-dev-guide/building/how-to-build-and-run.html
[rustcguidebuild]: https://rustc-dev-guide.rust-lang.org/building/how-to-build-and-run.html

## Pull Requests
[pull-requests]: #pull-requests
Expand Down Expand Up @@ -448,13 +448,13 @@ are:
* **Google!** ([search only in Rust Documentation][gsearchdocs] to find types, traits, etc. quickly)
* Don't be afraid to ask! The Rust community is friendly and helpful.

[rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/about-this-guide.html
[rustc dev guide]: https://rustc-dev-guide.rust-lang.org/about-this-guide.html
[gdfrustc]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/
[gsearchdocs]: https://www.google.com/search?q=site:doc.rust-lang.org+your+query+here
[rif]: http://internals.rust-lang.org
[rr]: https://doc.rust-lang.org/book/README.html
[rustforge]: https://forge.rust-lang.org/
[tlgba]: http://tomlee.co/2014/04/a-more-detailed-tour-of-the-rust-compiler/
[ro]: http://www.rustaceans.org/
[rctd]: https://rust-lang.github.io/rustc-dev-guide/tests/intro.html
[rctd]: https://rustc-dev-guide.rust-lang.org/tests/intro.html
[cheatsheet]: https://buildbot2.rust-lang.org/homu/
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ The Rust build system has a Python script called `x.py` to bootstrap building
the compiler. More information about it may be found by running `./x.py --help`
or reading the [rustc dev guide][rustcguidebuild].

[rustcguidebuild]: https://rust-lang.github.io/rustc-dev-guide/building/how-to-build-and-run.html
[rustcguidebuild]: https://rustc-dev-guide.rust-lang.org/building/how-to-build-and-run.html

### Building on *nix
1. Make sure you have installed the dependencies:
Expand Down Expand Up @@ -255,7 +255,7 @@ various parts of the compiler work.
Also, you may find the [rustdocs for the compiler itself][rustdocs] useful.

[rust-discord]: https://discord.gg/rust-lang
[rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/about-this-guide.html
[rustc dev guide]: https://rustc-dev-guide.rust-lang.org/about-this-guide.html
[rustdocs]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/

## License
Expand Down
2 changes: 1 addition & 1 deletion src/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ This directory contains the source code of the rust project, including:

For more information on how various parts of the compiler work, see the [rustc dev guide].

[rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/about-this-guide.html
[rustc dev guide]: https://rustc-dev-guide.rust-lang.org/about-this-guide.html
2 changes: 1 addition & 1 deletion src/doc/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ Rust. It's also sometimes called "the 'nomicon."

## The `rustc` Contribution Guide

[The `rustc` Guide](https://rust-lang.github.io/rustc-dev-guide/) documents how
[The `rustc` Guide](https://rustc-dev-guide.rust-lang.org/) documents how
the compiler works and how to contribute to it. This is useful if you want to build
or modify the Rust compiler from source (e.g. to target something non-standard).

Expand Down
2 changes: 1 addition & 1 deletion src/doc/rustc/src/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ more, you'll want to check that out.
If you would like to contribute to _this_ book, you can find its source in the
rustc source at [src/doc/rustc][rustc_book].

[rustc_dev_guide]: https://rust-lang.github.io/rustc-dev-guide/
[rustc_dev_guide]: https://rustc-dev-guide.rust-lang.org/
[rustc_book]: https://github.com/rust-lang/rust/tree/master/src/doc/rustc
2 changes: 1 addition & 1 deletion src/librustc/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
For more information about how rustc works, see the [rustc dev guide].

[rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/
[rustc dev guide]: https://rustc-dev-guide.rust-lang.org/
2 changes: 1 addition & 1 deletion src/librustc/dep_graph/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
To learn more about how dependency tracking works in rustc, see the [rustc
guide].

[rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/query.html
[rustc dev guide]: https://rustc-dev-guide.rust-lang.org/query.html
2 changes: 1 addition & 1 deletion src/librustc/dep_graph/graph.rs
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ impl DepGraph {
/// - If you need 3+ arguments, use a tuple for the
/// `arg` parameter.
///
/// [rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/incremental-compilation.html
/// [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/incremental-compilation.html
pub fn with_task<'a, C, A, R>(
&self,
key: DepNode,
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/hir/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! HIR datatypes. See the [rustc dev guide] for more info.
//!
//! [rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/hir.html
//! [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/hir.html

pub mod exports;
pub mod map;
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/infer/canonical.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
//! For a more detailed look at what is happening here, check
//! out the [chapter in the rustc dev guide][c].
//!
//! [c]: https://rust-lang.github.io/rustc-dev-guide/traits/canonicalization.html
//! [c]: https://rustc-dev-guide.rust-lang.org/traits/canonicalization.html

use crate::infer::MemberConstraint;
use crate::ty::subst::GenericArg;
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
//!
//! For more information about how rustc works, see the [rustc dev guide].
//!
//! [rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/
//! [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/
//!
//! # Note
//!
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/middle/region.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//! For more information about how MIR-based region-checking works,
//! see the [rustc dev guide].
//!
//! [rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/mir/borrowck.html
//! [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/mir/borrowck.html

use crate::ich::{NodeIdHashingMode, StableHashingContext};
use crate::ty::{self, DefIdTree, TyCtxt};
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/mir/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! MIR datatypes and passes. See the [rustc dev guide] for more info.
//!
//! [rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/mir/index.html
//! [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/mir/index.html
use crate::mir::interpret::{GlobalAlloc, Scalar};
use crate::mir::visit::MirVisitable;
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/traits/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Trait Resolution. See the [rustc dev guide] for more information on how this works.
//!
//! [rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/traits/resolution.html
//! [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/traits/resolution.html

pub mod query;
pub mod select;
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/traits/select.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Candidate selection. See the [rustc dev guide] for more information on how this works.
//!
//! [rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/traits/resolution.html#selection
//! [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/traits/resolution.html#selection

use self::EvaluationResult::*;

Expand Down
2 changes: 1 addition & 1 deletion src/librustc/ty/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,7 @@ pub struct FreeRegionInfo {
/// various **compiler queries** that have been performed. See the
/// [rustc dev guide] for more details.
///
/// [rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/ty.html
/// [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/ty.html
#[derive(Copy, Clone)]
#[rustc_diagnostic_item = "TyCtxt"]
pub struct TyCtxt<'tcx> {
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/ty/query/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
For more information about how the query system works, see the [rustc dev guide].

[rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/query.html
[rustc dev guide]: https://rustc-dev-guide.rust-lang.org/query.html
2 changes: 1 addition & 1 deletion src/librustc/ty/sty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1400,7 +1400,7 @@ pub type Region<'tcx> = &'tcx RegionKind;
///
/// [1]: http://smallcultfollowing.com/babysteps/blog/2013/10/29/intermingled-parameter-lists/
/// [2]: http://smallcultfollowing.com/babysteps/blog/2013/11/04/intermingled-parameter-lists/
/// [rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/traits/hrtb.html
/// [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/traits/hrtb.html
#[derive(Clone, PartialEq, Eq, Hash, Copy, RustcEncodable, RustcDecodable, PartialOrd, Ord)]
pub enum RegionKind {
/// Region bound in a type or fn declaration which will be
Expand Down
4 changes: 2 additions & 2 deletions src/librustc_ast/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ lexer, macro expander, and utilities for traversing ASTs.
For more information about how these things work in rustc, see the
rustc dev guide:

- [Parsing](https://rust-lang.github.io/rustc-dev-guide/the-parser.html)
- [Macro Expansion](https://rust-lang.github.io/rustc-dev-guide/macro-expansion.html)
- [Parsing](https://rustc-dev-guide.rust-lang.org/the-parser.html)
- [Macro Expansion](https://rustc-dev-guide.rust-lang.org/macro-expansion.html)
2 changes: 1 addition & 1 deletion src/librustc_codegen_llvm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ that runs towards the end of the compilation process.

For more information about how codegen works, see the [rustc dev guide].

[rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/codegen.html
[rustc dev guide]: https://rustc-dev-guide.rust-lang.org/codegen.html
2 changes: 1 addition & 1 deletion src/librustc_codegen_ssa/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Please read the rustc-dev-guide chapter on [Backend Agnostic Codegen][bac].

[bac]: https://rust-lang.github.io/rustc-dev-guide/codegen/backend-agnostic.html
[bac]: https://rustc-dev-guide.rust-lang.org/codegen/backend-agnostic.html
2 changes: 1 addition & 1 deletion src/librustc_driver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ options).

For more information about how the driver works, see the [rustc dev guide].

[rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/rustc-driver.html
[rustc dev guide]: https://rustc-dev-guide.rust-lang.org/rustc-driver.html
2 changes: 1 addition & 1 deletion src/librustc_hir/hir.rs
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ pub struct ModuleItems {
///
/// For more details, see the [rustc dev guide].
///
/// [rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/hir.html
/// [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/hir.html
#[derive(RustcEncodable, RustcDecodable, Debug)]
pub struct Crate<'hir> {
pub module: Mod<'hir>,
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_hir/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! HIR datatypes. See the [rustc dev guide] for more info.
//!
//! [rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/hir.html
//! [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/hir.html

#![feature(crate_visibility_modifier)]
#![feature(const_fn)] // For the unsizing cast on `&[]`
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_incremental/persist/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
For info on how the incremental compilation works, see the [rustc dev guide].

[rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/query.html
[rustc dev guide]: https://rustc-dev-guide.rust-lang.org/query.html
6 changes: 3 additions & 3 deletions src/librustc_infer/infer/canonical/canonicalizer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//! For an overview of what canonicalization is and how it fits into
//! rustc, check out the [chapter in the rustc dev guide][c].
//!
//! [c]: https://rust-lang.github.io/rustc-dev-guide/traits/canonicalization.html
//! [c]: https://rustc-dev-guide.rust-lang.org/traits/canonicalization.html

use crate::infer::canonical::{
Canonical, CanonicalTyVarKind, CanonicalVarInfo, CanonicalVarKind, Canonicalized,
Expand Down Expand Up @@ -35,7 +35,7 @@ impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
/// To get a good understanding of what is happening here, check
/// out the [chapter in the rustc dev guide][c].
///
/// [c]: https://rust-lang.github.io/rustc-dev-guide/traits/canonicalization.html#canonicalizing-the-query
/// [c]: https://rustc-dev-guide.rust-lang.org/traits/canonicalization.html#canonicalizing-the-query
pub fn canonicalize_query<V>(
&self,
value: &V,
Expand Down Expand Up @@ -79,7 +79,7 @@ impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
/// To get a good understanding of what is happening here, check
/// out the [chapter in the rustc dev guide][c].
///
/// [c]: https://rust-lang.github.io/rustc-dev-guide/traits/canonicalization.html#canonicalizing-the-query-result
/// [c]: https://rustc-dev-guide.rust-lang.org/traits/canonicalization.html#canonicalizing-the-query-result
pub fn canonicalize_response<V>(&self, value: &V) -> Canonicalized<'tcx, V>
where
V: TypeFoldable<'tcx>,
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_infer/infer/canonical/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
//! For a more detailed look at what is happening here, check
//! out the [chapter in the rustc dev guide][c].
//!
//! [c]: https://rust-lang.github.io/rustc-dev-guide/traits/canonicalization.html
//! [c]: https://rustc-dev-guide.rust-lang.org/traits/canonicalization.html

use crate::infer::{ConstVariableOrigin, ConstVariableOriginKind};
use crate::infer::{InferCtxt, RegionVariableOrigin, TypeVariableOrigin, TypeVariableOriginKind};
Expand Down
4 changes: 2 additions & 2 deletions src/librustc_infer/infer/canonical/query_response.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//! For an overview of what canonicaliation is and how it fits into
//! rustc, check out the [chapter in the rustc dev guide][c].
//!
//! [c]: https://rust-lang.github.io/rustc-dev-guide/traits/canonicalization.html
//! [c]: https://rustc-dev-guide.rust-lang.org/traits/canonicalization.html

use crate::infer::canonical::substitute::{substitute_value, CanonicalExt};
use crate::infer::canonical::{
Expand Down Expand Up @@ -197,7 +197,7 @@ impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
/// To get a good understanding of what is happening here, check
/// out the [chapter in the rustc dev guide][c].
///
/// [c]: https://rust-lang.github.io/rustc-dev-guide/traits/canonicalization.html#processing-the-canonicalized-query-result
/// [c]: https://rustc-dev-guide.rust-lang.org/traits/canonicalization.html#processing-the-canonicalized-query-result
pub fn instantiate_query_response_and_region_obligations<R>(
&self,
cause: &ObligationCause<'tcx>,
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_infer/infer/canonical/substitute.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//! For an overview of what canonicalization is and how it fits into
//! rustc, check out the [chapter in the rustc dev guide][c].
//!
//! [c]: https://rust-lang.github.io/rustc-dev-guide/traits/canonicalization.html
//! [c]: https://rustc-dev-guide.rust-lang.org/traits/canonicalization.html

use crate::infer::canonical::{Canonical, CanonicalVarValues};
use rustc::ty::fold::TypeFoldable;
Expand Down
4 changes: 2 additions & 2 deletions src/librustc_infer/infer/higher_ranked/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ solver, see [this chapter][oldhrtb] of the rustc-dev-guide.
To learn more about how they work in the _new_ trait solver, see [this
chapter][newhrtb].

[oldhrtb]: https://rust-lang.github.io/rustc-dev-guide/traits/hrtb.html
[newhrtb]: https://rust-lang.github.io/rustc-dev-guide/borrow_check/region_inference.html#placeholders-and-universes
[oldhrtb]: https://rustc-dev-guide.rust-lang.org/traits/hrtb.html
[newhrtb]: https://rustc-dev-guide.rust-lang.org/borrow_check/region_inference.html#placeholders-and-universes
2 changes: 1 addition & 1 deletion src/librustc_infer/infer/higher_ranked/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
/// For more information about how placeholders and HRTBs work, see
/// the [rustc dev guide].
///
/// [rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/traits/hrtb.html
/// [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/traits/hrtb.html
pub fn replace_bound_vars_with_placeholders<T>(
&self,
binder: &ty::Binder<T>,
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_infer/infer/lexical_region_resolve/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Lexical Region Resolution was removed in https://github.com/rust-lang/rust/pull/
Rust now uses Non-lexical lifetimes. For more info, please see the [borrowck
chapter][bc] in the rustc-dev-guide.

[bc]: https://rust-lang.github.io/rustc-dev-guide/borrow_check/region_inference.html
[bc]: https://rustc-dev-guide.rust-lang.org/borrow_check/region_inference.html
2 changes: 1 addition & 1 deletion src/librustc_infer/infer/region_constraints/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
For info on how the current borrowck works, see the [rustc dev guide].

[rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/borrow_check.html
[rustc dev guide]: https://rustc-dev-guide.rust-lang.org/borrow_check.html
2 changes: 1 addition & 1 deletion src/librustc_infer/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//!
//! For more information about how rustc works, see the [rustc dev guide].
//!
//! [rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/
//! [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/
//!
//! # Note
//!
Expand Down
4 changes: 2 additions & 2 deletions src/librustc_infer/traits/coherence.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//! See Rustc Dev Guide chapters on [trait-resolution] and [trait-specialization] for more info on
//! how this works.
//!
//! [trait-resolution]: https://rust-lang.github.io/rustc-dev-guide/traits/resolution.html
//! [trait-specialization]: https://rust-lang.github.io/rustc-dev-guide/traits/specialization.html
//! [trait-resolution]: https://rustc-dev-guide.rust-lang.org/traits/resolution.html
//! [trait-specialization]: https://rustc-dev-guide.rust-lang.org/traits/specialization.html

use crate::infer::{CombinedSnapshot, InferOk, TyCtxtInferExt};
use crate::traits::select::IntercrateAmbiguityCause;
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_infer/traits/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Trait Resolution. See the [rustc dev guide] for more information on how this works.
//!
//! [rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/traits/resolution.html
//! [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/traits/resolution.html

#[allow(dead_code)]
pub mod auto_trait;
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_infer/traits/query/type_op/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ pub trait TypeOp<'tcx>: Sized + fmt::Debug {
/// first canonicalize the key and then invoke the query on the tcx,
/// which produces the resulting query region constraints.
///
/// [c]: https://rust-lang.github.io/rustc-dev-guide/traits/canonicalization.html
/// [c]: https://rustc-dev-guide.rust-lang.org/traits/canonicalization.html
pub trait QueryTypeOp<'tcx>: fmt::Debug + Sized + TypeFoldable<'tcx> + 'tcx {
type QueryResponse: TypeFoldable<'tcx>;

Expand Down
6 changes: 3 additions & 3 deletions src/librustc_infer/traits/select.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

//! Candidate selection. See the [rustc dev guide] for more information on how this works.
//!
//! [rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/traits/resolution.html#selection
//! [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/traits/resolution.html#selection

use self::EvaluationResult::*;
use self::SelectionCandidate::*;
Expand Down Expand Up @@ -934,7 +934,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
// candidates. See the [rustc dev guide] for more details.
//
// [rustc dev guide]:
// https://rust-lang.github.io/rustc-dev-guide/traits/resolution.html#candidate-assembly
// https://rustc-dev-guide.rust-lang.org/traits/resolution.html#candidate-assembly

fn candidate_from_obligation<'o>(
&mut self,
Expand Down Expand Up @@ -2450,7 +2450,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
// type error. See the [rustc dev guide] for more details.
//
// [rustc dev guide]:
// https://rust-lang.github.io/rustc-dev-guide/traits/resolution.html#confirmation
// https://rustc-dev-guide.rust-lang.org/traits/resolution.html#confirmation

fn confirm_candidate(
&mut self,
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_infer/traits/specialize/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//! See the [rustc dev guide] for a bit more detail on how specialization
//! fits together with the rest of the trait machinery.
//!
//! [rustc dev guide]: https://rust-lang.github.io/rustc-dev-guide/traits/specialization.html
//! [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/traits/specialization.html

pub mod specialization_graph;
use specialization_graph::GraphExt;
Expand Down
Loading