Skip to content

Rollup of 6 pull requests #156424

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
GuillaumeGomez wants to merge 13 commits into from
Closed

Rollup of 6 pull requests #156424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e01e82a
remove forever-deprecated and hidden `f64` methods
cyrgani Mar 16, 2026
e9c05ff
Update ICU4X to 2.2
Manishearth May 4, 2026
7568032
Refuse to push changes with a dirty git client
Daniel-B-Smith Apr 28, 2026
74eecd9
Only reject uncommitted changes to tracked files
Daniel-B-Smith May 5, 2026
4a8c8a8
Update `sysinfo` version to `0.39.0`
GuillaumeGomez May 7, 2026
e35d0af
kernel_copy tests: properly join background threads
RalfJung May 9, 2026
e8eb80b
Improve doc comments for f32::ceil() and f32::floor()
Wilfred May 10, 2026
46fcd38
Rollup merge of #153975 - cyrgani:remove-f64-methods, r=scottmcm
GuillaumeGomez May 11, 2026
a7abd7f
Rollup merge of #156147 - Manishearth:icu4xup, r=Mark-Simulacrum
GuillaumeGomez May 11, 2026
af042be
Rollup merge of #156375 - RalfJung:kernel_copy-background-threads, r=…
GuillaumeGomez May 11, 2026
31ee0a1
Rollup merge of #155946 - Daniel-B-Smith:smithdb/dirty-verify, r=club…
GuillaumeGomez May 11, 2026
420f230
Rollup merge of #156282 - GuillaumeGomez:update-sysinfo, r=Mark-Simul…
GuillaumeGomez May 11, 2026
3d5a3bd
Rollup merge of #156392 - Wilfred:float_ceil_docs, r=Mark-Simulacrum
GuillaumeGomez May 11, 2026
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
74 changes: 38 additions & 36 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1759,22 +1759,23 @@ dependencies = [

[[package]]
name = "icu_collections"
version = "2.1.1"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
dependencies = [
"displaydoc",
"potential_utf",
"utf8_iter",
"yoke",
"zerofrom",
"zerovec",
]

[[package]]
name = "icu_list"
version = "2.1.1"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3a0b7b126e2fc42777d3c348611553d540bd3683caa39b387c5dd1036bb21a8"
checksum = "aeeaf517689324395bed4767f7c65504f5455942ed4c14ee54c2087ca00b816e"
dependencies = [
"icu_provider",
"regex-automata",
Expand All @@ -1785,9 +1786,9 @@ dependencies = [

[[package]]
name = "icu_locale"
version = "2.1.1"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "532b11722e350ab6bf916ba6eb0efe3ee54b932666afec989465f9243fe6dd60"
checksum = "d5a396343c7208121dc86e35623d3dfe19814a7613cfd14964994cdc9c9a2e26"
dependencies = [
"icu_collections",
"icu_locale_core",
Expand All @@ -1800,9 +1801,9 @@ dependencies = [

[[package]]
name = "icu_locale_core"
version = "2.1.1"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
dependencies = [
"displaydoc",
"litemap",
Expand All @@ -1814,15 +1815,15 @@ dependencies = [

[[package]]
name = "icu_locale_data"
version = "2.1.1"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f03e2fcaefecdf05619f3d6f91740e79ab969b4dd54f77cbf546b1d0d28e3147"
checksum = "d5fdcc9ac77c6d74ff5cf6e65ef3181d6af32003b16fce3a77fb451d2f695993"

[[package]]
name = "icu_normalizer"
version = "2.1.1"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
dependencies = [
"icu_collections",
"icu_normalizer_data",
Expand All @@ -1834,15 +1835,15 @@ dependencies = [

[[package]]
name = "icu_normalizer_data"
version = "2.1.1"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"

[[package]]
name = "icu_properties"
version = "2.1.1"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99"
checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
dependencies = [
"icu_collections",
"icu_locale_core",
Expand All @@ -1854,15 +1855,15 @@ dependencies = [

[[package]]
name = "icu_properties_data"
version = "2.1.1"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899"
checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"

[[package]]
name = "icu_provider"
version = "2.1.1"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
dependencies = [
"displaydoc",
"icu_locale_core",
Expand Down Expand Up @@ -3113,9 +3114,9 @@ checksum = "07589615d719a60c8dd8a4622e7946465dfef20d1a428f969e3443e7386d5f45"

[[package]]
name = "quote"
version = "1.0.42"
version = "1.0.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
dependencies = [
"proc-macro2",
]
Expand Down Expand Up @@ -5339,9 +5340,9 @@ dependencies = [

[[package]]
name = "sysinfo"
version = "0.38.4"
version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92ab6a2f8bfe508deb3c6406578252e491d299cbbf3bc0529ecc3313aee4a52f"
checksum = "cd9f9fe3d2b7b75cf4f2805e5b9926e8ac47146667b16b86298c4a8bf08cc469"
dependencies = [
"libc",
"objc2-core-foundation",
Expand Down Expand Up @@ -5552,9 +5553,9 @@ dependencies = [

[[package]]
name = "tinystr"
version = "0.8.2"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
dependencies = [
"displaydoc",
"serde_core",
Expand Down Expand Up @@ -6714,9 +6715,9 @@ dependencies = [

[[package]]
name = "yoke"
version = "0.8.1"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
dependencies = [
"stable_deref_trait",
"yoke-derive",
Expand All @@ -6725,9 +6726,9 @@ dependencies = [

[[package]]
name = "yoke-derive"
version = "0.8.1"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
dependencies = [
"proc-macro2",
"quote",
Expand Down Expand Up @@ -6778,20 +6779,21 @@ dependencies = [

[[package]]
name = "zerotrie"
version = "0.2.3"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
dependencies = [
"displaydoc",
"yoke",
"zerofrom",
"zerovec",
]

[[package]]
name = "zerovec"
version = "0.11.5"
version = "0.11.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
dependencies = [
"serde",
"yoke",
Expand All @@ -6801,9 +6803,9 @@ dependencies = [

[[package]]
name = "zerovec-derive"
version = "0.11.2"
version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
dependencies = [
"proc-macro2",
"quote",
Expand Down
6 changes: 3 additions & 3 deletions compiler/rustc_baked_icu_data/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ edition = "2024"

[dependencies]
# tidy-alphabetical-start
icu_list = { version = "2.0", default-features = false }
icu_locale = { version = "2.0", default-features = false, features = ["compiled_data"] }
icu_provider = { version = "2.0", features = ["baked", "sync"] }
icu_list = { version = "2.2", default-features = false }
icu_locale = { version = "2.2", default-features = false, features = ["compiled_data"] }
icu_provider = { version = "2.2", features = ["baked", "sync"] }
zerovec = "0.11.0"
# tidy-alphabetical-end
10 changes: 5 additions & 5 deletions compiler/rustc_baked_icu_data/src/data/list_and_v1.rs.data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion compiler/rustc_baked_icu_data/src/data/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ include!("list_and_v1.rs.data");
#[macro_export]
macro_rules! __make_provider {
($ name : ty) => {
#[clippy::msrv = "1.82"]
#[clippy::msrv = "1.86"]
impl $name {
#[allow(dead_code)]
pub(crate) const MUST_USE_MAKE_PROVIDER_MACRO: () = ();
Expand Down
4 changes: 2 additions & 2 deletions compiler/rustc_error_messages/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
fluent-bundle = "0.16"
icu_list = { version = "2.0", default-features = false, features = ["alloc"] }
icu_locale = { version = "2.0", default-features = false }
icu_list = { version = "2.2", default-features = false, features = ["alloc"] }
icu_locale = { version = "2.2", default-features = false }
intl-memoizer = "0.5.1"
rustc_baked_icu_data = { path = "../rustc_baked_icu_data" }
rustc_data_structures = { path = "../rustc_data_structures" }
Expand Down
18 changes: 0 additions & 18 deletions library/core/src/num/f64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,15 +819,6 @@ impl f64 {
!self.is_sign_negative()
}

#[must_use]
#[stable(feature = "rust1", since = "1.0.0")]
#[deprecated(since = "1.0.0", note = "renamed to is_sign_positive")]
#[inline]
#[doc(hidden)]
pub fn is_positive(self) -> bool {
self.is_sign_positive()
}

/// Returns `true` if `self` has a negative sign, including `-0.0`, NaNs with
/// negative sign bit and negative infinity.
///
Expand Down Expand Up @@ -855,15 +846,6 @@ impl f64 {
self.to_bits() & Self::SIGN_MASK != 0
}

#[must_use]
#[stable(feature = "rust1", since = "1.0.0")]
#[deprecated(since = "1.0.0", note = "renamed to is_sign_negative")]
#[inline]
#[doc(hidden)]
pub fn is_negative(self) -> bool {
self.is_sign_negative()
}

/// Returns the least number greater than `self`.
///
/// Let `TINY` be the smallest representable positive `f64`. Then,
Expand Down
6 changes: 4 additions & 2 deletions library/std/src/num/f32.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use crate::sys::cmath;

#[cfg(not(test))]
impl f32 {
/// Returns the largest integer less than or equal to `self`.
/// Returns the largest integer that is less than or equal to `self`.
///
/// This function always returns the precise result.
///
Expand All @@ -50,7 +50,7 @@ impl f32 {
core::f32::math::floor(self)
}

/// Returns the smallest integer greater than or equal to `self`.
/// Returns the smallest integer that is greater than or equal to `self`.
///
/// This function always returns the precise result.
///
Expand All @@ -59,9 +59,11 @@ impl f32 {
/// ```
/// let f = 3.01_f32;
/// let g = 4.0_f32;
/// let h = -3.01_f32;
///
/// assert_eq!(f.ceil(), 4.0);
/// assert_eq!(g.ceil(), 4.0);
/// assert_eq!(h.ceil(), -3.0);
/// ```
#[doc(alias = "ceiling")]
#[rustc_allow_incoherent_impl]
Expand Down
6 changes: 4 additions & 2 deletions library/std/src/num/f64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use crate::sys::cmath;

#[cfg(not(test))]
impl f64 {
/// Returns the largest integer less than or equal to `self`.
/// Returns the largest integer that is less than or equal to `self`.
///
/// This function always returns the precise result.
///
Expand All @@ -50,7 +50,7 @@ impl f64 {
core::f64::math::floor(self)
}

/// Returns the smallest integer greater than or equal to `self`.
/// Returns the smallest integer that is greater than or equal to `self`.
///
/// This function always returns the precise result.
///
Expand All @@ -59,9 +59,11 @@ impl f64 {
/// ```
/// let f = 3.01_f64;
/// let g = 4.0_f64;
/// let h = -3.01_f64;
///
/// assert_eq!(f.ceil(), 4.0);
/// assert_eq!(g.ceil(), 4.0);
/// assert_eq!(h.ceil(), -3.0);
/// ```
#[doc(alias = "ceiling")]
#[rustc_allow_incoherent_impl]
Expand Down
22 changes: 18 additions & 4 deletions library/std/src/sys/io/kernel_copy/linux/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,14 @@ fn bench_file_to_socket_copy(b: &mut test::Bencher) {
let mut sink = crate::net::TcpStream::connect(sink_drainer.local_addr().unwrap()).unwrap();
let mut sink_drainer = sink_drainer.accept().unwrap().0;

crate::thread::spawn(move || {
let t = crate::thread::spawn(move || {
let mut sink_buf = vec![0u8; 1024 * 1024];
loop {
sink_drainer.read(&mut sink_buf[..]).unwrap();
let n = sink_drainer.read(&mut sink_buf[..]).unwrap();
if n == 0 {
// EOF
break;
}
}
});

Expand All @@ -178,6 +182,9 @@ fn bench_file_to_socket_copy(b: &mut test::Bencher) {
src.seek(SeekFrom::Start(0)).unwrap();
assert_eq!(BYTES as u64, io::copy(&mut src, &mut sink).unwrap());
});

drop(sink); // close our end, so that the thread goes down
t.join().unwrap();
}

#[bench]
Expand All @@ -196,10 +203,14 @@ fn bench_file_to_uds_copy(b: &mut test::Bencher) {

let (mut sink, mut sink_drainer) = crate::os::unix::net::UnixStream::pair().unwrap();

crate::thread::spawn(move || {
let t = crate::thread::spawn(move || {
let mut sink_buf = vec![0u8; 1024 * 1024];
loop {
sink_drainer.read(&mut sink_buf[..]).unwrap();
let n = sink_drainer.read(&mut sink_buf[..]).unwrap();
if n == 0 {
// EOF
break;
}
}
});

Expand All @@ -208,6 +219,9 @@ fn bench_file_to_uds_copy(b: &mut test::Bencher) {
src.seek(SeekFrom::Start(0)).unwrap();
assert_eq!(BYTES as u64, io::copy(&mut src, &mut sink).unwrap());
});

drop(sink); // close our end, so that the thread goes down
t.join().unwrap();
}

#[cfg(any(target_os = "linux", target_os = "android"))]
Expand Down
4 changes: 2 additions & 2 deletions src/bootstrap/Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,9 +742,9 @@ dependencies = [

[[package]]
name = "sysinfo"
version = "0.38.4"
version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92ab6a2f8bfe508deb3c6406578252e491d299cbbf3bc0529ecc3313aee4a52f"
checksum = "cd9f9fe3d2b7b75cf4f2805e5b9926e8ac47146667b16b86298c4a8bf08cc469"
dependencies = [
"libc",
"memchr",
Expand Down
Loading
Loading