Skip to content

Commit 7569cf9

Browse files
committed
Merge conflict fix: disambiguate f32 -> prim@f32 and u32 -> prim@u32
1 parent 25c034c commit 7569cf9

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

library/std/src/primitive_docs.rs

+2
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ mod prim_bool {}
9999
/// at all we know it can never produce a value which isn't a [`u32`]. This illustrates another
100100
/// behaviour of the `!` type - expressions with type `!` will coerce into any other type.
101101
///
102+
/// [`u32`]: prim@u32
102103
/// [`exit`]: process::exit
103104
///
104105
/// # `!` and generics
@@ -801,6 +802,7 @@ mod prim_f32 {}
801802
///
802803
/// *[See also the `std::f64::consts` module][`crate::f64::consts`].*
803804
///
805+
/// [`f32`]: prim@f32
804806
/// [wikipedia]: https://en.wikipedia.org/wiki/Double-precision_floating-point_format
805807
#[stable(feature = "rust1", since = "1.0.0")]
806808
mod prim_f64 {}

0 commit comments

Comments
 (0)