Skip to content
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

Jump to bottom

Rollup of 3 pull requests #119313

Merged
merged 7 commits into from
Dec 26, 2023
Merged

Rollup of 3 pull requests #119313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3896f0b
Fix doc typo for read_exact_at
AlexBuz Dec 25, 2023
0e88874
fix `./configure --set change-id`
jyn514 Dec 25, 2023
51dff45
Update sysinfo version to 0.30.1
GuillaumeGomez Dec 25, 2023
c2dcfc7
Update sysinfo sub-dependency version to 0.29.11
GuillaumeGomez Dec 25, 2023
e1b3f45
Rollup merge of #119287 - AlexBuz:patch-1, r=the8472
matthiaskrgr Dec 26, 2023
c59de6b
Rollup merge of #119294 - jyn514:configure-change-id, r=onur-ozkan
matthiaskrgr Dec 26, 2023
f7dc91f
Rollup merge of #119303 - GuillaumeGomez:update-sysinfo, r=onur-ozkan
matthiaskrgr Dec 26, 2023
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
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading