Skip to content

Commit b81f0ea

Browse files
authored
Merge pull request #1175 from rust-lang/maint
Maintenance
2 parents c13af32 + 9ae6b99 commit b81f0ea

File tree

9 files changed

+1825
-1838
lines changed

9 files changed

+1825
-1838
lines changed

compiler/base/Cargo.toml

Lines changed: 214 additions & 126 deletions
Large diffs are not rendered by default.

compiler/base/crate-information.json

Lines changed: 111 additions & 61 deletions
Large diffs are not rendered by default.

compiler/base/orchestrator/Cargo.lock

Lines changed: 79 additions & 123 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

compiler/base/orchestrator/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ toml = { version = "0.9.2", default-features = false, features = ["parse", "disp
2525
tracing = { version = "0.1.37", default-features = false, features = ["attributes"] }
2626

2727
[target.'cfg(target_os = "linux")'.dependencies]
28-
procfs = { version = "0.17.0", default-features = false }
28+
procfs = { version = "0.18.0", default-features = false }
2929

3030
[target.'cfg(target_os = "macos")'.dependencies]
3131
libc = { version = "0.2.150", default-features = false }
32-
mach2 = { version = "0.4.1", default-features = false }
32+
mach2 = { version = "0.5.0", default-features = false }
3333

3434
[dev-dependencies]
3535
assert_matches = "1.5.0"

compiler/base/orchestrator/src/coordinator.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3985,7 +3985,9 @@ mod tests {
39853985
#[tokio::test]
39863986
#[snafu::report]
39873987
async fn miri() -> Result<()> {
3988-
let coordinator = new_coordinator();
3988+
// We set the `MIRI_SYSROOT` variable to something that's only
3989+
// valid on Linux.
3990+
let coordinator = new_coordinator_docker();
39893991

39903992
let req = MiriRequest {
39913993
code: r#"
@@ -4013,7 +4015,7 @@ mod tests {
40134015
#[tokio::test]
40144016
#[snafu::report]
40154017
async fn miri_tests() -> Result<()> {
4016-
let coordinator = new_coordinator();
4018+
let coordinator = new_coordinator_docker();
40174019

40184020
let req = MiriRequest {
40194021
tests: true,

tests/Gemfile.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ GEM
3232
racc (~> 1.4)
3333
public_suffix (6.0.2)
3434
racc (1.8.1)
35-
rack (3.2.0)
35+
rack (3.2.1)
3636
rack-test (2.2.0)
3737
rack (>= 1.3)
38-
regexp_parser (2.10.0)
39-
rexml (3.4.1)
38+
regexp_parser (2.11.2)
39+
rexml (3.4.2)
4040
rspec (3.13.1)
4141
rspec-core (~> 3.13.0)
4242
rspec-expectations (~> 3.13.0)
@@ -49,13 +49,13 @@ GEM
4949
rspec-mocks (3.13.5)
5050
diff-lcs (>= 1.2.0, < 2.0)
5151
rspec-support (~> 3.13.0)
52-
rspec-support (3.13.4)
53-
rubyzip (2.4.1)
54-
selenium-webdriver (4.34.0)
52+
rspec-support (3.13.5)
53+
rubyzip (3.0.2)
54+
selenium-webdriver (4.35.0)
5555
base64 (~> 0.2)
5656
logger (~> 1.4)
5757
rexml (~> 3.2, >= 3.2.5)
58-
rubyzip (>= 1.2.2, < 3.0)
58+
rubyzip (>= 1.2.2, < 4.0)
5959
websocket (~> 1.0)
6060
websocket (1.2.11)
6161
xpath (3.2.0)

0 commit comments

Comments
 (0)