Skip to content

Commit 504f596

Browse files
committed
Auto merge of rust-lang#141954 - matthiaskrgr:rollup-zptd6t9, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - rust-lang#141554 (Improve documentation for codegen options) - rust-lang#141817 (rustc_llvm: add Windows system libs only when cross-compiling from Wi…) - rust-lang#141843 (Add `visit_id` to ast `Visitor`) - rust-lang#141881 (Subtree update of `rust-analyzer`) - rust-lang#141898 ([rustdoc-json] Implement PartialOrd and Ord for rustdoc_types::Id) - rust-lang#141921 (Disable f64 minimum/maximum tests for arm 32) - rust-lang#141930 (Enable triagebot `[concern]` functionality) - rust-lang#141936 (Decouple "reporting in deps" from `FutureIncompatibilityReason`) - rust-lang#141949 (move `test-float-parse` tool into `src/tools` dir) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 468d93f + f1a72ed commit 504f596

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

core/src/num/dec2flt/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
//!
5959
//! There are unit tests but they are woefully inadequate at ensuring correctness, they only cover
6060
//! a small percentage of possible errors. Far more extensive tests are located in the directory
61-
//! `src/etc/test-float-parse` as a Rust program.
61+
//! `src/tools/test-float-parse` as a Rust program.
6262
//!
6363
//! A note on integer overflow: Many parts of this file perform arithmetic with the decimal
6464
//! exponent `e`. Primarily, we shift the decimal point around: Before the first decimal digit,

core/src/num/f64.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ impl f64 {
943943
/// This returns NaN when *either* argument is NaN, as opposed to
944944
/// [`f64::max`] which only returns NaN when *both* arguments are NaN.
945945
///
946-
/// ```
946+
/// ```ignore-arm-unknown-linux-gnueabihf (see https://github.com/rust-lang/rust/issues/141087)
947947
/// #![feature(float_minimum_maximum)]
948948
/// let x = 1.0_f64;
949949
/// let y = 2.0_f64;
@@ -970,7 +970,7 @@ impl f64 {
970970
/// This returns NaN when *either* argument is NaN, as opposed to
971971
/// [`f64::min`] which only returns NaN when *both* arguments are NaN.
972972
///
973-
/// ```
973+
/// ```ignore-arm-unknown-linux-gnueabihf (see https://github.com/rust-lang/rust/issues/141087)
974974
/// #![feature(float_minimum_maximum)]
975975
/// let x = 1.0_f64;
976976
/// let y = 2.0_f64;

0 commit comments

Comments
 (0)