Skip to content

Commit a815c3b

Browse files
committed
Auto merge of #119313 - matthiaskrgr:rollup-41x48j6, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #119287 (Fix doc typo for read_exact_at) - #119294 (fix `./configure --set change-id`) - #119303 (Update sysinfo) r? `@ghost` `@rustbot` modify labels: rollup
2 parents f645628 + f7dc91f commit a815c3b

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -5205,9 +5205,9 @@ dependencies = [
52055205

52065206
[[package]]
52075207
name = "sysinfo"
5208-
version = "0.29.2"
5208+
version = "0.29.11"
52095209
source = "registry+https://github.com/rust-lang/crates.io-index"
5210-
checksum = "9557d0845b86eea8182f7b10dff120214fb6cd9fd937b6f4917714e546a38695"
5210+
checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666"
52115211
dependencies = [
52125212
"cfg-if",
52135213
"core-foundation-sys",

config.example.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#
3131
# If `change-id` does not match the version that is currently running,
3232
# `x.py` will inform you about the changes made on bootstrap.
33-
# change-id = <latest change id in src/bootstrap/src/utils/change_tracker.rs>
33+
#change-id = <latest change id in src/bootstrap/src/utils/change_tracker.rs>
3434

3535
# =============================================================================
3636
# Tweaking how LLVM is compiled

library/std/src/os/unix/fs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pub trait FileExt {
6868
io::default_read_vectored(|b| self.read_at(b, offset), bufs)
6969
}
7070

71-
/// Reads the exact number of byte required to fill `buf` from the given offset.
71+
/// Reads the exact number of bytes required to fill `buf` from the given offset.
7272
///
7373
/// The offset is relative to the start of the file and thus independent
7474
/// from the current cursor.

src/bootstrap/Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -620,9 +620,9 @@ dependencies = [
620620

621621
[[package]]
622622
name = "sysinfo"
623-
version = "0.30.0"
623+
version = "0.30.1"
624624
source = "registry+https://github.com/rust-lang/crates.io-index"
625-
checksum = "c68492e7268037de59ae153d7efb79546cf94a18a9548235420d3d8d2436b4b1"
625+
checksum = "01e979b637815805abbdeea72e4b6d9374dd0efce6524cc65c31e14911dbc671"
626626
dependencies = [
627627
"cfg-if",
628628
"core-foundation-sys",

src/bootstrap/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ walkdir = "2"
5959
xz2 = "0.1"
6060

6161
# Dependencies needed by the build-metrics feature
62-
sysinfo = { version = "0.30.0", optional = true }
62+
sysinfo = { version = "0.30", optional = true }
6363

6464
# Solaris doesn't support flock() and thus fd-lock is not option now
6565
[target.'cfg(not(target_os = "solaris"))'.dependencies]

0 commit comments

Comments
 (0)