Skip to content

Commit 5095101

Browse files
committed
Auto merge of rust-lang#67752 - Dylan-DPC:rollup-7f9v4nx, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - rust-lang#67430 (doc: minus (U+2212) instead of dash (U+002D) for negative infinity) - rust-lang#67697 (Move the region_scope_tree query to librustc_passes.) - rust-lang#67719 (Add self to .mailmap) - rust-lang#67723 (Add error code explanation for E0477) - rust-lang#67735 (Support `-Z ui-testing=yes/no`) Failed merges: r? @ghost
2 parents 71bb0ff + 529a42a commit 5095101

23 files changed

+921
-909
lines changed

.mailmap

+1
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ Jorge Aparicio <[email protected]> <[email protected]>
139139
Joseph Martin <[email protected]>
140140
141141
142+
142143
Junyoung Cho <[email protected]>
143144
144145

src/libcore/num/f32.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ pub const NAN: f32 = 0.0_f32 / 0.0_f32;
6262
/// Infinity (∞).
6363
#[stable(feature = "rust1", since = "1.0.0")]
6464
pub const INFINITY: f32 = 1.0_f32 / 0.0_f32;
65-
/// Negative infinity (-∞).
65+
/// Negative infinity (∞).
6666
#[stable(feature = "rust1", since = "1.0.0")]
6767
pub const NEG_INFINITY: f32 = -1.0_f32 / 0.0_f32;
6868

src/libcore/num/f64.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ pub const NAN: f64 = 0.0_f64 / 0.0_f64;
6262
/// Infinity (∞).
6363
#[stable(feature = "rust1", since = "1.0.0")]
6464
pub const INFINITY: f64 = 1.0_f64 / 0.0_f64;
65-
/// Negative infinity (-∞).
65+
/// Negative infinity (∞).
6666
#[stable(feature = "rust1", since = "1.0.0")]
6767
pub const NEG_INFINITY: f64 = -1.0_f64 / 0.0_f64;
6868

0 commit comments

Comments
 (0)