Skip to content

Commit

Permalink
Auto merge of rust-lang#119313 - matthiaskrgr:rollup-41x48j6, r=matth…
Browse files Browse the repository at this point in the history
…iaskrgr

Rollup of 3 pull requests

Successful merges:

 - rust-lang#119287 (Fix doc typo for read_exact_at)
 - rust-lang#119294 (fix `./configure --set change-id`)
 - rust-lang#119303 (Update sysinfo)

r? `@ghost`
`@rustbot` modify labels: rollup
  • Loading branch information
bors committed Dec 26, 2023
2 parents f645628 + f7dc91f commit a815c3b
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5205,9 +5205,9 @@ dependencies = [

[[package]]
name = "sysinfo"
version = "0.29.2"
version = "0.29.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9557d0845b86eea8182f7b10dff120214fb6cd9fd937b6f4917714e546a38695"
checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666"
dependencies = [
"cfg-if",
"core-foundation-sys",
Expand Down
2 changes: 1 addition & 1 deletion config.example.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#
# If `change-id` does not match the version that is currently running,
# `x.py` will inform you about the changes made on bootstrap.
# change-id = <latest change id in src/bootstrap/src/utils/change_tracker.rs>
#change-id = <latest change id in src/bootstrap/src/utils/change_tracker.rs>

# =============================================================================
# Tweaking how LLVM is compiled
Expand Down
2 changes: 1 addition & 1 deletion library/std/src/os/unix/fs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ pub trait FileExt {
io::default_read_vectored(|b| self.read_at(b, offset), bufs)
}

/// Reads the exact number of byte required to fill `buf` from the given offset.
/// Reads the exact number of bytes required to fill `buf` from the given offset.
///
/// The offset is relative to the start of the file and thus independent
/// from the current cursor.
Expand Down
4 changes: 2 additions & 2 deletions src/bootstrap/Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -620,9 +620,9 @@ dependencies = [

[[package]]
name = "sysinfo"
version = "0.30.0"
version = "0.30.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c68492e7268037de59ae153d7efb79546cf94a18a9548235420d3d8d2436b4b1"
checksum = "01e979b637815805abbdeea72e4b6d9374dd0efce6524cc65c31e14911dbc671"
dependencies = [
"cfg-if",
"core-foundation-sys",
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ walkdir = "2"
xz2 = "0.1"

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

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

0 comments on commit a815c3b

Please sign in to comment.