Skip to content

Commit

Permalink
Merge conflict fix: disambiguate f32 -> prim@f32 and u32 -> prim@u32
Browse files Browse the repository at this point in the history
  • Loading branch information
kofls committed Aug 26, 2020
1 parent 25c034c commit 7569cf9
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions library/std/src/primitive_docs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ mod prim_bool {}
/// at all we know it can never produce a value which isn't a [`u32`]. This illustrates another
/// behaviour of the `!` type - expressions with type `!` will coerce into any other type.
///
/// [`u32`]: prim@u32
/// [`exit`]: process::exit
///
/// # `!` and generics
Expand Down Expand Up @@ -801,6 +802,7 @@ mod prim_f32 {}
///
/// *[See also the `std::f64::consts` module][`crate::f64::consts`].*
///
/// [`f32`]: prim@f32
/// [wikipedia]: https://en.wikipedia.org/wiki/Double-precision_floating-point_format
#[stable(feature = "rust1", since = "1.0.0")]
mod prim_f64 {}
Expand Down

0 comments on commit 7569cf9

Please sign in to comment.