Skip to content

cargo update #113046

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.

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

Merged
merged 4 commits into from
Jul 2, 2023
Merged
Changes from all commits
Commits
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
1,019 changes: 520 additions & 499 deletions Cargo.lock

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions compiler/rustc_driver/Cargo.toml
Original file line number Diff line number Diff line change
@@ -8,3 +8,6 @@ crate-type = ["dylib"]

[dependencies]
rustc_driver_impl = { path = "../rustc_driver_impl" }
# FIXME(Nilstrieb): 0.37.12 adds eventfd support for FreeBSD,
# but FreeBSD 12 does not support it: https://github.com/bytecodealliance/rustix/issues/716
rustix = "=0.37.11"
2 changes: 1 addition & 1 deletion compiler/rustc_log/Cargo.toml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ edition = "2021"
tracing = "0.1.28"
tracing-subscriber = { version = "0.3.3", default-features = false, features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] }
tracing-tree = "0.2.0"
tracing-core = "0.1.28"
tracing-core = "=0.1.30" # FIXME(Nilstrieb) tracing has a deadlock: https://github.com/tokio-rs/tracing/issues/2635

[dev-dependencies]
rustc_span = { path = "../rustc_span" }
3 changes: 2 additions & 1 deletion compiler/rustc_macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ proc-macro = true

[dependencies]
synstructure = "0.13.0"
syn = { version = "2", features = ["full"] }
# FIXME(Nilstrieb): Updating this causes changes in the diagnostics output.
syn = { version = "=2.0.8", features = ["full"] }
proc-macro2 = "1"
quote = "1"
3 changes: 2 additions & 1 deletion library/std/Cargo.toml
Original file line number Diff line number Diff line change
@@ -18,7 +18,8 @@ panic_unwind = { path = "../panic_unwind", optional = true }
panic_abort = { path = "../panic_abort" }
core = { path = "../core", public = true }
libc = { version = "0.2.146", default-features = false, features = ['rustc-dep-of-std'], public = true }
compiler_builtins = { version = "0.1.93" }
# FIXME(Nilstrieb): https://github.com/rust-lang/compiler-builtins/pull/532/files#r1249354225
compiler_builtins = { version = "=0.1.93" }
profiler_builtins = { path = "../profiler_builtins", optional = true }
unwind = { path = "../unwind" }
hashbrown = { version = "0.14", default-features = false, features = ['rustc-dep-of-std'] }
4 changes: 3 additions & 1 deletion src/tools/tidy/src/deps.rs
Original file line number Diff line number Diff line change
@@ -111,7 +111,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
"aho-corasick",
"allocator-api2", // FIXME: only appears in Cargo.lock due to https://github.com/rust-lang/cargo/issues/10801
"annotate-snippets",
"ansi_term",
"ar_archive_writer",
"arrayvec",
"atty",
@@ -143,6 +142,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
"either",
"elsa",
"ena",
"equivalent",
"expect-test",
"fallible-iterator", // dependency of `thorin`
"fastrand",
@@ -187,10 +187,12 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
"memmap2",
"memoffset",
"miniz_oxide",
"nu-ansi-term",
"num_cpus",
"object",
"odht",
"once_cell",
"overload",
"parking_lot",
"parking_lot_core",
"pathdiff",