Skip to content

Commit ce2041b

Browse files
authored
Rollup merge of rust-lang#76714 - camelid:patch-3, r=jonas-schievink
Small docs improvements @rustbot modify labels: T-doc T-compiler
2 parents 51fd7db + 5c1043a commit ce2041b

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

compiler/rustc_middle/src/mir/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2285,8 +2285,8 @@ impl<'tcx> Debug for Rvalue<'tcx> {
22852285
/// Constants
22862286
///
22872287
/// Two constants are equal if they are the same constant. Note that
2288-
/// this does not necessarily mean that they are "==" in Rust -- in
2289-
/// particular one must be wary of `NaN`!
2288+
/// this does not necessarily mean that they are `==` in Rust -- in
2289+
/// particular, one must be wary of `NaN`!
22902290
22912291
#[derive(Clone, Copy, PartialEq, TyEncodable, TyDecodable, HashStable)]
22922292
pub struct Constant<'tcx> {

compiler/rustc_middle/src/ty/context.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ use std::mem;
6666
use std::ops::{Bound, Deref};
6767
use std::sync::Arc;
6868

69-
/// A type that is not publicly constructable. This prevents people from making `TyKind::Error`
70-
/// except through `tcx.err*()`, which are in this module.
69+
/// A type that is not publicly constructable. This prevents people from making [`TyKind::Error`]s
70+
/// except through the error-reporting functions on a [`tcx`][TyCtxt].
7171
#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
7272
#[derive(TyEncodable, TyDecodable, HashStable)]
7373
pub struct DelaySpanBugEmitted(());

compiler/rustc_middle/src/ty/sty.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -1233,13 +1233,13 @@ rustc_index::newtype_index! {
12331233
/// particular, imagine a type like this:
12341234
///
12351235
/// for<'a> fn(for<'b> fn(&'b isize, &'a isize), &'a char)
1236-
/// ^ ^ | | |
1237-
/// | | | | |
1238-
/// | +------------+ 0 | |
1239-
/// | | |
1240-
/// +--------------------------------+ 1 |
1241-
/// | |
1242-
/// +------------------------------------------+ 0
1236+
/// ^ ^ | | |
1237+
/// | | | | |
1238+
/// | +------------+ 0 | |
1239+
/// | | |
1240+
/// +----------------------------------+ 1 |
1241+
/// | |
1242+
/// +----------------------------------------------+ 0
12431243
///
12441244
/// In this type, there are two binders (the outer fn and the inner
12451245
/// fn). We need to be able to determine, for any given region, which

0 commit comments

Comments
 (0)