Skip to content

Commit

Permalink
Merge pull request #1081 from rust-lang/maint
Browse files Browse the repository at this point in the history
Maintenance
  • Loading branch information
shepmaster authored Aug 6, 2024
2 parents 74743bf + 9147dca commit 52177c7
Show file tree
Hide file tree
Showing 9 changed files with 1,738 additions and 1,617 deletions.
114 changes: 56 additions & 58 deletions compiler/base/Cargo.toml

Large diffs are not rendered by default.

56 changes: 28 additions & 28 deletions compiler/base/crate-information.json
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
},
{
"name": "bytes",
"version": "1.7.0",
"version": "1.7.1",
"id": "bytes"
},
{
Expand Down Expand Up @@ -216,17 +216,17 @@
},
{
"name": "clap",
"version": "4.5.11",
"version": "4.5.13",
"id": "clap"
},
{
"name": "clap_builder",
"version": "4.5.11",
"version": "4.5.13",
"id": "clap_builder"
},
{
"name": "clap_derive",
"version": "4.5.11",
"version": "4.5.13",
"id": "clap_derive"
},
{
Expand Down Expand Up @@ -431,7 +431,7 @@
},
{
"name": "flate2",
"version": "1.0.30",
"version": "1.0.31",
"id": "flate2"
},
{
Expand Down Expand Up @@ -636,7 +636,7 @@
},
{
"name": "hyper-util",
"version": "0.1.6",
"version": "0.1.7",
"id": "hyper_util"
},
{
Expand Down Expand Up @@ -726,7 +726,7 @@
},
{
"name": "indexmap",
"version": "2.2.6",
"version": "2.3.0",
"id": "indexmap"
},
{
Expand Down Expand Up @@ -921,7 +921,7 @@
},
{
"name": "ndarray",
"version": "0.15.6",
"version": "0.16.0",
"id": "ndarray"
},
{
Expand Down Expand Up @@ -1141,7 +1141,7 @@
},
{
"name": "ppv-lite86",
"version": "0.2.18",
"version": "0.2.20",
"id": "ppv_lite86"
},
{
Expand Down Expand Up @@ -1236,7 +1236,7 @@
},
{
"name": "regex",
"version": "1.10.5",
"version": "1.10.6",
"id": "regex"
},
{
Expand All @@ -1256,7 +1256,7 @@
},
{
"name": "rgb",
"version": "0.8.45",
"version": "0.8.47",
"id": "rgb"
},
{
Expand Down Expand Up @@ -1291,12 +1291,12 @@
},
{
"name": "rustls-pemfile",
"version": "2.1.2",
"version": "2.1.3",
"id": "rustls_pemfile"
},
{
"name": "rustls-pki-types",
"version": "1.7.0",
"version": "1.8.0",
"id": "rustls_pki_types"
},
{
Expand Down Expand Up @@ -1341,7 +1341,7 @@
},
{
"name": "serde_json",
"version": "1.0.121",
"version": "1.0.122",
"id": "serde_json"
},
{
Expand Down Expand Up @@ -1486,7 +1486,7 @@
},
{
"name": "tempfile",
"version": "3.10.1",
"version": "3.11.0",
"id": "tempfile"
},
{
Expand Down Expand Up @@ -1594,14 +1594,19 @@
"version": "0.26.0",
"id": "tokio_rustls"
},
{
"name": "tokio-stream",
"version": "0.1.15",
"id": "tokio_stream"
},
{
"name": "tokio-util",
"version": "0.7.11",
"id": "tokio_util"
},
{
"name": "toml",
"version": "0.8.17",
"version": "0.8.19",
"id": "toml"
},
{
Expand All @@ -1611,7 +1616,7 @@
},
{
"name": "toml_edit",
"version": "0.22.18",
"version": "0.22.20",
"id": "toml_edit"
},
{
Expand Down Expand Up @@ -1644,6 +1649,11 @@
"version": "0.1.32",
"id": "tracing_core"
},
{
"name": "trpl",
"version": "0.1.0",
"id": "trpl"
},
{
"name": "try-lock",
"version": "0.2.5",
Expand Down Expand Up @@ -1821,7 +1831,7 @@
},
{
"name": "winnow",
"version": "0.6.16",
"version": "0.6.18",
"id": "winnow"
},
{
Expand Down Expand Up @@ -1859,21 +1869,11 @@
"version": "0.7.35",
"id": "zerocopy"
},
{
"name": "zerocopy",
"version": "0.6.6",
"id": "zerocopy_0_6_6"
},
{
"name": "zerocopy-derive",
"version": "0.7.35",
"id": "zerocopy_derive"
},
{
"name": "zerocopy-derive",
"version": "0.6.6",
"id": "zerocopy_derive_0_6_6"
},
{
"name": "zerofrom",
"version": "0.1.4",
Expand Down
16 changes: 8 additions & 8 deletions compiler/base/modify-cargo-toml/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 17 additions & 16 deletions compiler/base/orchestrator/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions tests/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ GEM
capybara-screenshot (1.0.26)
capybara (>= 1.0, < 4)
launchy
childprocess (5.0.0)
childprocess (5.1.0)
logger (~> 1.5)
diff-lcs (1.5.1)
launchy (3.0.1)
addressable (~> 2.8)
Expand All @@ -34,7 +35,7 @@ GEM
rack-test (2.1.0)
rack (>= 1.3)
regexp_parser (2.9.2)
rexml (3.3.2)
rexml (3.3.4)
strscan
rspec (3.13.0)
rspec-core (~> 3.13.0)
Expand Down
Loading

0 comments on commit 52177c7

Please sign in to comment.