Skip to content

Rollup of 6 pull requests #71906

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.

Sign up for GitHub

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
Dylan-DPC-zz wants to merge 16 commits into from
Closed

Rollup of 6 pull requests #71906

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
34eb2c1
Report cannot move errors in promoted MIR
matthewjasper Apr 22, 2020
a992f95
Add examples for std::f32 constants.
steveklabnik May 3, 2020
0768fa4
add some whitespace
steveklabnik May 3, 2020
d38d429
correct -> intended
steveklabnik May 4, 2020
8bef0a3
f64 examples
steveklabnik May 4, 2020
55e37f9
Add examples to int macros
steveklabnik May 4, 2020
4a8fa18
add a missing word
Dante-Broggi May 4, 2020
a9b6af9
double neg
lcnr May 4, 2020
d02128f
Update btree_map::VacantEntry::insert docs to actually call insert
carols10cents May 4, 2020
36f51f9
fix typo in function name
euclio May 4, 2020
043d1f3
Rollup merge of #71587 - matthewjasper:promoted-move-errors, r=nikoma…
Dylan-DPC May 4, 2020
49190c4
Rollup merge of #71845 - steveklabnik:add-const-examples, r=dtolnay
Dylan-DPC May 4, 2020
defe3d2
Rollup merge of #71883 - Dante-Broggi:patch-1, r=Dylan-DPC
Dylan-DPC May 4, 2020
38b8f78
Rollup merge of #71891 - lcnr:not-iter-any, r=Dylan-DPC
Dylan-DPC May 4, 2020
eac9003
Rollup merge of #71892 - integer32llc:btreemap-entry-vacant-docs, r=j…
Dylan-DPC May 4, 2020
fedb690
Rollup merge of #71904 - euclio:function-typo, r=jonas-schievink
Dylan-DPC May 4, 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
correct -> intended
  • Loading branch information
@steveklabnik
steveklabnik committed May 4, 2020
commit d38d429be74c8bad84d330ccdae95fcaf6f7c30a
28 changes: 14 additions & 14 deletions src/libcore/num/f32.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use crate::num::FpCategory;
/// // deprecated way
/// let r = std::f32::RADIX;
///
/// // correct way
/// // intended way
/// let r = f32::RADIX;
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
Expand All @@ -40,7 +40,7 @@ pub const RADIX: u32 = f32::RADIX;
/// // deprecated way
/// let d = std::f32::MANTISSA_DIGITS;
///
/// // correct way
/// // intended way
/// let d = f32::MANTISSA_DIGITS;
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
Expand All @@ -55,7 +55,7 @@ pub const MANTISSA_DIGITS: u32 = f32::MANTISSA_DIGITS;
/// // deprecated way
/// let d = std::f32::DIGITS;
///
/// // correct way
/// // intended way
/// let d = f32::DIGITS;
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
Expand All @@ -74,7 +74,7 @@ pub const DIGITS: u32 = f32::DIGITS;
/// // deprecated way
/// let e = std::f32::EPSILON;
///
/// // correct way
/// // intended way
/// let e = f32::EPSILON;
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
Expand All @@ -89,7 +89,7 @@ pub const EPSILON: f32 = f32::EPSILON;
/// // deprecated way
/// let min = std::f32::MIN;
///
/// // correct way
/// // intended way
/// let min = f32::MIN;
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
Expand All @@ -104,7 +104,7 @@ pub const MIN: f32 = f32::MIN;
/// // deprecated way
/// let min = std::f32::MIN_POSITIVE;
///
/// // correct way
/// // intended way
/// let min = f32::MIN_POSITIVE;
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
Expand All @@ -119,7 +119,7 @@ pub const MIN_POSITIVE: f32 = f32::MIN_POSITIVE;
/// // deprecated way
/// let max = std::f32::MAX;
///
/// // correct way
/// // intended way
/// let max = f32::MAX;
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
Expand All @@ -134,7 +134,7 @@ pub const MAX: f32 = f32::MAX;
/// // deprecated way
/// let min = std::f32::MIN_EXP;
///
/// // correct way
/// // intended way
/// let min = f32::MIN_EXP;
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
Expand All @@ -149,7 +149,7 @@ pub const MIN_EXP: i32 = f32::MIN_EXP;
/// // deprecated way
/// let max = std::f32::MAX_EXP;
///
/// // correct way
/// // intended way
/// let max = f32::MAX_EXP;
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
Expand All @@ -164,7 +164,7 @@ pub const MAX_EXP: i32 = f32::MAX_EXP;
/// // deprecated way
/// let min = std::f32::MIN_10_EXP;
///
/// // correct way
/// // intended way
/// let min = f32::MIN_10_EXP;
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
Expand All @@ -179,7 +179,7 @@ pub const MIN_10_EXP: i32 = f32::MIN_10_EXP;
/// // deprecated way
/// let max = std::f32::MAX_10_EXP;
///
/// // correct way
/// // intended way
/// let max = f32::MAX_10_EXP;
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
Expand All @@ -194,7 +194,7 @@ pub const MAX_10_EXP: i32 = f32::MAX_10_EXP;
/// // deprecated way
/// let nan = std::f32::NAN;
///
/// // correct way
/// // intended way
/// let nan = f32::NAN;
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
Expand All @@ -209,7 +209,7 @@ pub const NAN: f32 = f32::NAN;
/// // deprecated way
/// let inf = std::f32::INFINITY;
///
/// // correct way
/// // intended way
/// let inf = f32::INFINITY;
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
Expand All @@ -224,7 +224,7 @@ pub const INFINITY: f32 = f32::INFINITY;
/// // deprecated way
/// let ninf = std::f32::NEG_INFINITY;
///
/// // correct way
/// // intended way
/// let ninf = f32::NEG_INFINITY;
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
Expand Down