Skip to content

Commit 5c77bdd

Browse files
committed
Auto merge of rust-lang#110311 - matthiaskrgr:rollup-kn2k5bq, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - rust-lang#109225 (Clarify that RUST_MIN_STACK may be internally cached) - rust-lang#109800 (Improve safe transmute error reporting) - rust-lang#110158 (Remove obsolete test case) - rust-lang#110180 (don't uniquify regions when canonicalizing) - rust-lang#110207 (Assemble `Unpin` candidates specially for generators in new solver) - rust-lang#110276 (Remove all but one of the spans in `BoundRegionKind::BrAnon`) - rust-lang#110279 (rustdoc: Correctly handle built-in compiler proc-macros as proc-macro and not macro) - rust-lang#110298 (Cover edge cases for {f32, f64}.hypot() docs) - rust-lang#110299 (Switch to `EarlyBinder` for `impl_subject` query) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3f7c206 + 0f50e95 commit 5c77bdd

File tree

5 files changed

+10
-20
lines changed

5 files changed

+10
-20
lines changed

core/src/mem/transmutability.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
/// notwithstanding whatever safety checks you have asked the compiler to [`Assume`] are satisfied.
66
#[unstable(feature = "transmutability", issue = "99571")]
77
#[lang = "transmute_trait"]
8-
#[rustc_on_unimplemented(
9-
message = "`{Src}` cannot be safely transmuted into `{Self}` in the defining scope of `{Context}`.",
10-
label = "`{Src}` cannot be safely transmuted into `{Self}` in the defining scope of `{Context}`."
11-
)]
128
pub unsafe trait BikeshedIntrinsicFrom<Src, Context, const ASSUME: Assume = { Assume::NOTHING }>
139
where
1410
Src: ?Sized,

core/tests/num/dec2flt/mod.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,3 @@ fn massive_exponent() {
127127
assert_eq!(format!("1e-{max}000").parse(), Ok(0.0));
128128
assert_eq!(format!("1e{max}000").parse(), Ok(f64::INFINITY));
129129
}
130-
131-
#[test]
132-
fn borderline_overflow() {
133-
let mut s = "0.".to_string();
134-
for _ in 0..375 {
135-
s.push('3');
136-
}
137-
// At the time of this writing, this returns Err(..), but this is a bug that should be fixed.
138-
// It makes no sense to enshrine that in a test, the important part is that it doesn't panic.
139-
let _ = s.parse::<f64>();
140-
}

std/src/f32.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,10 @@ impl f32 {
581581
unsafe { cmath::cbrtf(self) }
582582
}
583583

584-
/// Calculates the length of the hypotenuse of a right-angle triangle given
585-
/// legs of length `x` and `y`.
584+
/// Compute the distance between the origin and a point (`x`, `y`) on the
585+
/// Euclidean plane. Equivalently, compute the length of the hypotenuse of a
586+
/// right-angle triangle with other sides having length `x.abs()` and
587+
/// `y.abs()`.
586588
///
587589
/// # Examples
588590
///

std/src/f64.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -583,8 +583,10 @@ impl f64 {
583583
unsafe { cmath::cbrt(self) }
584584
}
585585

586-
/// Calculates the length of the hypotenuse of a right-angle triangle given
587-
/// legs of length `x` and `y`.
586+
/// Compute the distance between the origin and a point (`x`, `y`) on the
587+
/// Euclidean plane. Equivalently, compute the length of the hypotenuse of a
588+
/// right-angle triangle with other sides having length `x.abs()` and
589+
/// `y.abs()`.
588590
///
589591
/// # Examples
590592
///

std/src/thread/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@
131131
//!
132132
//! * Build the thread with [`Builder`] and pass the desired stack size to [`Builder::stack_size`].
133133
//! * Set the `RUST_MIN_STACK` environment variable to an integer representing the desired stack
134-
//! size (in bytes). Note that setting [`Builder::stack_size`] will override this.
134+
//! size (in bytes). Note that setting [`Builder::stack_size`] will override this. Be aware that
135+
//! changes to `RUST_MIN_STACK` may be ignored after program start.
135136
//!
136137
//! Note that the stack size of the main thread is *not* determined by Rust.
137138
//!

0 commit comments

Comments
 (0)