mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-10-27 10:17:15 +00:00
chore: Bump dependencies
This commit is contained in:
parent
c85fcd29a3
commit
500ea05aef
37 changed files with 261 additions and 197 deletions
|
|
@ -20,13 +20,13 @@ tt = { workspace = true, optional = true }
|
|||
intern.workspace = true
|
||||
|
||||
[dev-dependencies]
|
||||
expect-test = "1.4.1"
|
||||
oorandom = "11.1.3"
|
||||
expect-test = "1.5.1"
|
||||
oorandom = "11.1.5"
|
||||
# We depend on both individually instead of using `features = ["derive"]` to microoptimize the
|
||||
# build graph: if the feature was enabled, syn would be built early on in the graph if `smolstr`
|
||||
# supports `arbitrary`. This way, we avoid feature unification.
|
||||
arbitrary = "1.3.2"
|
||||
derive_arbitrary = "1.3.2"
|
||||
arbitrary = "1.4.1"
|
||||
derive_arbitrary = "1.4.1"
|
||||
|
||||
# local deps
|
||||
syntax-bridge.workspace = true
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ rust-version.workspace = true
|
|||
[dependencies]
|
||||
arrayvec.workspace = true
|
||||
bitflags.workspace = true
|
||||
cov-mark = "2.0.0-pre.1"
|
||||
cov-mark = "2.0.0"
|
||||
drop_bomb = "0.1.5"
|
||||
either.workspace = true
|
||||
fst = { version = "0.4.7", default-features = false }
|
||||
|
|
@ -25,7 +25,7 @@ rustc-hash.workspace = true
|
|||
tracing.workspace = true
|
||||
smallvec.workspace = true
|
||||
triomphe.workspace = true
|
||||
rustc_apfloat = "0.2.0"
|
||||
rustc_apfloat = "0.2.2"
|
||||
text-size.workspace = true
|
||||
salsa.workspace = true
|
||||
query-group.workspace = true
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ rust-version.workspace = true
|
|||
[lib]
|
||||
|
||||
[dependencies]
|
||||
cov-mark = "2.0.0-pre.1"
|
||||
cov-mark = "2.0.0"
|
||||
tracing.workspace = true
|
||||
either.workspace = true
|
||||
rustc-hash.workspace = true
|
||||
|
|
@ -35,7 +35,7 @@ parser.workspace = true
|
|||
syntax-bridge.workspace = true
|
||||
|
||||
[dev-dependencies]
|
||||
expect-test = "1.4.0"
|
||||
expect-test = "1.5.1"
|
||||
|
||||
[features]
|
||||
in-rust-tree = ["syntax/in-rust-tree"]
|
||||
|
|
|
|||
|
|
@ -12,26 +12,26 @@ rust-version.workspace = true
|
|||
[lib]
|
||||
|
||||
[dependencies]
|
||||
cov-mark = "2.0.0-pre.1"
|
||||
cov-mark = "2.0.0"
|
||||
itertools.workspace = true
|
||||
arrayvec.workspace = true
|
||||
bitflags.workspace = true
|
||||
smallvec.workspace = true
|
||||
ena = "0.14.0"
|
||||
ena = "0.14.3"
|
||||
either.workspace = true
|
||||
oorandom = "11.1.3"
|
||||
oorandom = "11.1.5"
|
||||
tracing.workspace = true
|
||||
rustc-hash.workspace = true
|
||||
scoped-tls = "1.0.0"
|
||||
scoped-tls = "1.0.1"
|
||||
chalk-solve.workspace = true
|
||||
chalk-ir.workspace = true
|
||||
chalk-recursive.workspace = true
|
||||
chalk-derive.workspace = true
|
||||
la-arena.workspace = true
|
||||
triomphe.workspace = true
|
||||
typed-arena = "2.0.1"
|
||||
typed-arena = "2.0.2"
|
||||
indexmap.workspace = true
|
||||
rustc_apfloat = "0.2.0"
|
||||
rustc_apfloat = "0.2.2"
|
||||
query-group.workspace = true
|
||||
salsa.workspace = true
|
||||
|
||||
|
|
@ -50,7 +50,7 @@ syntax.workspace = true
|
|||
span.workspace = true
|
||||
|
||||
[dev-dependencies]
|
||||
expect-test = "1.4.0"
|
||||
expect-test = "1.5.1"
|
||||
tracing.workspace = true
|
||||
tracing-subscriber.workspace = true
|
||||
tracing-tree.workspace = true
|
||||
|
|
|
|||
|
|
@ -1221,15 +1221,15 @@ fn precise_macro_call_location(
|
|||
.nth(derive_attr_index.ast_index())
|
||||
.and_then(|x| Either::left(x.1))?;
|
||||
let token_tree = derive_attr.meta()?.token_tree()?;
|
||||
let group_by = token_tree
|
||||
let chunk_by = token_tree
|
||||
.syntax()
|
||||
.children_with_tokens()
|
||||
.filter_map(|elem| match elem {
|
||||
syntax::NodeOrToken::Token(tok) => Some(tok),
|
||||
_ => None,
|
||||
})
|
||||
.group_by(|t| t.kind() == T![,]);
|
||||
let (_, mut group) = group_by
|
||||
.chunk_by(|t| t.kind() == T![,]);
|
||||
let (_, mut group) = chunk_by
|
||||
.into_iter()
|
||||
.filter(|&(comma, _)| !comma)
|
||||
.nth(*derive_index as usize)?;
|
||||
|
|
|
|||
|
|
@ -929,7 +929,7 @@ impl SourceAnalyzer {
|
|||
// FIXME: Multiple derives can have the same helper
|
||||
let name_ref = name_ref.as_name();
|
||||
for (macro_id, mut helpers) in
|
||||
helpers.iter().group_by(|(_, macro_id, ..)| macro_id).into_iter()
|
||||
helpers.iter().chunk_by(|(_, macro_id, ..)| macro_id).into_iter()
|
||||
{
|
||||
if let Some(idx) = helpers.position(|(name, ..)| *name == name_ref)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ rust-version.workspace = true
|
|||
[lib]
|
||||
|
||||
[dependencies]
|
||||
cov-mark = "2.0.0-pre.1"
|
||||
cov-mark = "2.0.0"
|
||||
|
||||
itertools.workspace = true
|
||||
either.workspace = true
|
||||
|
|
@ -26,7 +26,7 @@ ide-db.workspace = true
|
|||
hir.workspace = true
|
||||
|
||||
[dev-dependencies]
|
||||
expect-test = "1.4.0"
|
||||
expect-test = "1.5.1"
|
||||
|
||||
# local deps
|
||||
test-utils.workspace = true
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ fn compute_dbg_replacement(macro_expr: ast::MacroExpr) -> Option<(TextRange, Opt
|
|||
}
|
||||
|
||||
let mac_input = tt.syntax().children_with_tokens().skip(1).take_while(|it| *it != r_delim);
|
||||
let input_expressions = mac_input.group_by(|tok| tok.kind() == T![,]);
|
||||
let input_expressions = mac_input.chunk_by(|tok| tok.kind() == T![,]);
|
||||
let input_expressions = input_expressions
|
||||
.into_iter()
|
||||
.filter_map(|(is_sep, group)| (!is_sep).then_some(group))
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ rust-version.workspace = true
|
|||
[lib]
|
||||
|
||||
[dependencies]
|
||||
cov-mark = "2.0.0-pre.1"
|
||||
cov-mark = "2.0.0"
|
||||
itertools.workspace = true
|
||||
tracing.workspace = true
|
||||
|
||||
|
|
@ -29,7 +29,7 @@ syntax.workspace = true
|
|||
hir.workspace = true
|
||||
|
||||
[dev-dependencies]
|
||||
expect-test = "1.4.0"
|
||||
expect-test = "1.5.1"
|
||||
|
||||
# local deps
|
||||
test-utils.workspace = true
|
||||
|
|
|
|||
|
|
@ -380,7 +380,7 @@ fn parse_comma_sep_expr(input: ast::TokenTree) -> Option<Vec<ast::Expr>> {
|
|||
.children_with_tokens()
|
||||
.skip(1)
|
||||
.take_while(|it| it.as_token() != Some(&r_paren));
|
||||
let input_expressions = tokens.group_by(|tok| tok.kind() == T![,]);
|
||||
let input_expressions = tokens.chunk_by(|tok| tok.kind() == T![,]);
|
||||
Some(
|
||||
input_expressions
|
||||
.into_iter()
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ rust-version.workspace = true
|
|||
[lib]
|
||||
|
||||
[dependencies]
|
||||
cov-mark = "2.0.0-pre.1"
|
||||
cov-mark = "2.0.0"
|
||||
crossbeam-channel.workspace = true
|
||||
tracing.workspace = true
|
||||
rayon.workspace = true
|
||||
|
|
@ -22,7 +22,7 @@ either.workspace = true
|
|||
itertools.workspace = true
|
||||
arrayvec.workspace = true
|
||||
indexmap.workspace = true
|
||||
memchr = "2.6.4"
|
||||
memchr = "2.7.4"
|
||||
salsa.workspace = true
|
||||
query-group.workspace = true
|
||||
triomphe.workspace = true
|
||||
|
|
@ -44,7 +44,7 @@ hir.workspace = true
|
|||
line-index.workspace = true
|
||||
|
||||
[dev-dependencies]
|
||||
expect-test = "1.4.0"
|
||||
expect-test = "1.5.1"
|
||||
|
||||
# local deps
|
||||
test-utils.workspace = true
|
||||
|
|
|
|||
|
|
@ -484,7 +484,7 @@ pub fn parse_tt_as_comma_sep_paths(
|
|||
None => None,
|
||||
Some(tok) => Some(tok),
|
||||
});
|
||||
let input_expressions = tokens.group_by(|tok| tok.kind() == T![,]);
|
||||
let input_expressions = tokens.chunk_by(|tok| tok.kind() == T![,]);
|
||||
let paths = input_expressions
|
||||
.into_iter()
|
||||
.filter_map(|(is_sep, group)| (!is_sep).then_some(group))
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ rust-version.workspace = true
|
|||
[lib]
|
||||
|
||||
[dependencies]
|
||||
cov-mark = "2.0.0-pre.1"
|
||||
cov-mark = "2.0.0"
|
||||
either.workspace = true
|
||||
itertools.workspace = true
|
||||
serde_json.workspace = true
|
||||
|
|
@ -27,7 +27,7 @@ ide-db.workspace = true
|
|||
paths.workspace = true
|
||||
|
||||
[dev-dependencies]
|
||||
expect-test = "1.4.0"
|
||||
expect-test = "1.5.1"
|
||||
|
||||
# local deps
|
||||
test-utils.workspace = true
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ rust-version.workspace = true
|
|||
[lib]
|
||||
|
||||
[dependencies]
|
||||
cov-mark = "2.0.0-pre.1"
|
||||
cov-mark = "2.0.0"
|
||||
itertools.workspace = true
|
||||
|
||||
# local deps
|
||||
|
|
@ -22,7 +22,7 @@ parser.workspace = true
|
|||
syntax.workspace = true
|
||||
|
||||
[dev-dependencies]
|
||||
expect-test = "1.4.0"
|
||||
expect-test = "1.5.1"
|
||||
triomphe.workspace = true
|
||||
|
||||
# local deps
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ rust-version.workspace = true
|
|||
[lib]
|
||||
|
||||
[dependencies]
|
||||
cov-mark = "2.0.0-pre.1"
|
||||
cov-mark = "2.0.0"
|
||||
arrayvec.workspace = true
|
||||
either.workspace = true
|
||||
itertools.workspace = true
|
||||
|
|
@ -25,7 +25,7 @@ dot.workspace = true
|
|||
smallvec.workspace = true
|
||||
triomphe.workspace = true
|
||||
nohash-hasher.workspace = true
|
||||
rustc_apfloat = "0.2.0"
|
||||
rustc_apfloat = "0.2.2"
|
||||
|
||||
# local deps
|
||||
cfg.workspace = true
|
||||
|
|
@ -46,7 +46,7 @@ hir.workspace = true
|
|||
toolchain.workspace = true
|
||||
|
||||
[dev-dependencies]
|
||||
expect-test = "1.4.0"
|
||||
expect-test = "1.5.1"
|
||||
|
||||
# local deps
|
||||
test-utils.workspace = true
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ rust-version.workspace = true
|
|||
[lib]
|
||||
|
||||
[dependencies]
|
||||
cov-mark = "2.0.0-pre.1"
|
||||
cov-mark = "2.0.0"
|
||||
rustc-hash.workspace = true
|
||||
smallvec.workspace = true
|
||||
arrayvec.workspace = true
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ tracing = { workspace = true, optional = true }
|
|||
edition.workspace = true
|
||||
|
||||
[dev-dependencies]
|
||||
expect-test = "1.4.0"
|
||||
expect-test = "1.5.1"
|
||||
|
||||
stdx.workspace = true
|
||||
|
||||
|
|
|
|||
|
|
@ -9,4 +9,4 @@ license = "MIT OR Apache-2.0"
|
|||
[lib]
|
||||
|
||||
[build-dependencies]
|
||||
cargo_metadata = "0.18.1"
|
||||
cargo_metadata = "0.19.2"
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ fn main() {
|
|||
let mut artifact_path = None;
|
||||
for message in Message::parse_stream(output.stdout.as_slice()) {
|
||||
if let Message::CompilerArtifact(artifact) = message.unwrap() {
|
||||
if artifact.target.kind.contains(&"proc-macro".to_string())
|
||||
if artifact.target.kind.contains(&cargo_metadata::TargetKind::ProcMacro)
|
||||
&& (artifact.package_id.repr.starts_with(&repr)
|
||||
|| artifact.package_id.repr == pkgid)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ rust-version.workspace = true
|
|||
|
||||
[dependencies]
|
||||
cfg-if = "1.0.0"
|
||||
jemalloc-ctl = { version = "0.5.0", package = "tikv-jemalloc-ctl", optional = true }
|
||||
jemalloc-ctl = { version = "0.5.4", package = "tikv-jemalloc-ctl", optional = true }
|
||||
|
||||
[target.'cfg(all(target_os = "linux", not(target_env = "ohos")))'.dependencies]
|
||||
perf-event = "=0.4.7"
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ stdx.workspace = true
|
|||
toolchain.workspace = true
|
||||
|
||||
[dev-dependencies]
|
||||
expect-test = "1.4.0"
|
||||
expect-test = "1.5.1"
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
|
|
|
|||
|
|
@ -343,7 +343,12 @@ impl WorkspaceBuildScripts {
|
|||
Message::CompilerArtifact(message) => {
|
||||
with_output_for(&message.package_id.repr, &mut |name, data| {
|
||||
progress(format!("building proc-macros: {name}"));
|
||||
if message.target.kind.iter().any(|k| k == "proc-macro") {
|
||||
if message
|
||||
.target
|
||||
.kind
|
||||
.iter()
|
||||
.any(|k| *k == cargo_metadata::TargetKind::ProcMacro)
|
||||
{
|
||||
// Skip rmeta file
|
||||
if let Some(filename) =
|
||||
message.filenames.iter().find(|file| is_dylib(file))
|
||||
|
|
|
|||
|
|
@ -232,16 +232,20 @@ pub enum TargetKind {
|
|||
}
|
||||
|
||||
impl TargetKind {
|
||||
fn new(kinds: &[String]) -> TargetKind {
|
||||
fn new(kinds: &[cargo_metadata::TargetKind]) -> TargetKind {
|
||||
for kind in kinds {
|
||||
return match kind.as_str() {
|
||||
"bin" => TargetKind::Bin,
|
||||
"test" => TargetKind::Test,
|
||||
"bench" => TargetKind::Bench,
|
||||
"example" => TargetKind::Example,
|
||||
"custom-build" => TargetKind::BuildScript,
|
||||
"proc-macro" => TargetKind::Lib { is_proc_macro: true },
|
||||
_ if kind.contains("lib") => TargetKind::Lib { is_proc_macro: false },
|
||||
return match kind {
|
||||
cargo_metadata::TargetKind::Bin => TargetKind::Bin,
|
||||
cargo_metadata::TargetKind::Test => TargetKind::Test,
|
||||
cargo_metadata::TargetKind::Bench => TargetKind::Bench,
|
||||
cargo_metadata::TargetKind::Example => TargetKind::Example,
|
||||
cargo_metadata::TargetKind::CustomBuild => TargetKind::BuildScript,
|
||||
cargo_metadata::TargetKind::ProcMacro => TargetKind::Lib { is_proc_macro: true },
|
||||
cargo_metadata::TargetKind::Lib
|
||||
| cargo_metadata::TargetKind::DyLib
|
||||
| cargo_metadata::TargetKind::CDyLib
|
||||
| cargo_metadata::TargetKind::StaticLib
|
||||
| cargo_metadata::TargetKind::RLib => TargetKind::Lib { is_proc_macro: false },
|
||||
_ => continue,
|
||||
};
|
||||
}
|
||||
|
|
@ -476,7 +480,7 @@ impl CargoWorkspace {
|
|||
cargo_metadata::Edition::E2015 => Edition::Edition2015,
|
||||
cargo_metadata::Edition::E2018 => Edition::Edition2018,
|
||||
cargo_metadata::Edition::E2021 => Edition::Edition2021,
|
||||
cargo_metadata::Edition::_E2024 => Edition::Edition2024,
|
||||
cargo_metadata::Edition::E2024 => Edition::Edition2024,
|
||||
_ => {
|
||||
tracing::error!("Unsupported edition `{:?}`", edition);
|
||||
Edition::CURRENT
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ quote = "1.0"
|
|||
syn = { version = "2.0", features = ["full", "extra-traits"] }
|
||||
|
||||
[dev-dependencies]
|
||||
expect-test = "1.5.0"
|
||||
expect-test = "1.5.1"
|
||||
salsa.workspace = true
|
||||
|
|
|
|||
|
|
@ -22,34 +22,34 @@ path = "src/bin/main.rs"
|
|||
anyhow.workspace = true
|
||||
base64 = "0.22"
|
||||
crossbeam-channel.workspace = true
|
||||
dirs = "5.0.1"
|
||||
dirs = "6.0.0"
|
||||
dissimilar.workspace = true
|
||||
ide-completion.workspace = true
|
||||
indexmap.workspace = true
|
||||
itertools.workspace = true
|
||||
scip = "0.5.1"
|
||||
scip = "0.5.2"
|
||||
lsp-types = { version = "=0.95.0", features = ["proposed"] }
|
||||
parking_lot = "0.12.1"
|
||||
xflags = "0.3.0"
|
||||
oorandom = "11.1.3"
|
||||
parking_lot = "0.12.3"
|
||||
xflags = "0.3.2"
|
||||
oorandom = "11.1.5"
|
||||
rayon.workspace = true
|
||||
rustc-hash.workspace = true
|
||||
serde_json = { workspace = true, features = ["preserve_order"] }
|
||||
serde.workspace = true
|
||||
serde_derive.workspace = true
|
||||
tenthash = "1.0.0"
|
||||
num_cpus = "1.15.0"
|
||||
mimalloc = { version = "0.1.30", default-features = false, optional = true }
|
||||
num_cpus = "1.16.0"
|
||||
mimalloc = { version = "0.1.44", default-features = false, optional = true }
|
||||
lsp-server.workspace = true
|
||||
tracing.workspace = true
|
||||
tracing-subscriber.workspace = true
|
||||
tracing-tree.workspace = true
|
||||
triomphe.workspace = true
|
||||
toml = "0.8.8"
|
||||
toml = "0.8.20"
|
||||
nohash-hasher.workspace = true
|
||||
walkdir = "2.3.2"
|
||||
walkdir = "2.5.0"
|
||||
semver.workspace = true
|
||||
memchr = "2.7.1"
|
||||
memchr = "2.7.4"
|
||||
cargo_metadata.workspace = true
|
||||
process-wrap.workspace = true
|
||||
|
||||
|
|
@ -81,10 +81,10 @@ windows-sys = { version = "0.59", features = [
|
|||
] }
|
||||
|
||||
[target.'cfg(not(target_env = "msvc"))'.dependencies]
|
||||
jemallocator = { version = "0.5.0", package = "tikv-jemallocator", optional = true }
|
||||
jemallocator = { version = "0.5.4", package = "tikv-jemallocator", optional = true }
|
||||
|
||||
[dev-dependencies]
|
||||
expect-test = "1.4.0"
|
||||
expect-test = "1.5.1"
|
||||
xshell.workspace = true
|
||||
|
||||
test-utils.workspace = true
|
||||
|
|
|
|||
|
|
@ -258,7 +258,7 @@ pub(crate) fn fetch_native_diagnostics(
|
|||
for (file_id, group) in odd_ones
|
||||
.into_iter()
|
||||
.sorted_by_key(|it| it.range.file_id)
|
||||
.group_by(|it| it.range.file_id)
|
||||
.chunk_by(|it| it.range.file_id)
|
||||
.into_iter()
|
||||
{
|
||||
if !subscriptions.contains(&file_id) {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ rust-version.workspace = true
|
|||
[lib]
|
||||
|
||||
[dependencies]
|
||||
backtrace = { version = "0.3.67", optional = true }
|
||||
backtrace = { version = "0.3.74", optional = true }
|
||||
jod-thread = "0.1.2"
|
||||
crossbeam-channel.workspace = true
|
||||
itertools.workspace = true
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@ stdx.workspace = true
|
|||
|
||||
[dev-dependencies]
|
||||
rayon.workspace = true
|
||||
expect-test = "1.4.0"
|
||||
rustc_apfloat = "0.2.0"
|
||||
expect-test = "1.5.1"
|
||||
rustc_apfloat = "0.2.2"
|
||||
|
||||
test-utils.workspace = true
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ rust-version.workspace = true
|
|||
|
||||
[dependencies]
|
||||
# Avoid adding deps here, this crate is widely used in tests it should compile fast!
|
||||
dissimilar = "1.0.7"
|
||||
dissimilar = "1.0.10"
|
||||
text-size.workspace = true
|
||||
rustc-hash.workspace = true
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ rust-version.workspace = true
|
|||
[lib]
|
||||
|
||||
[dependencies]
|
||||
home = "0.5.4"
|
||||
home = "0.5.11"
|
||||
camino.workspace = true
|
||||
|
||||
[lints]
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ rust-version.workspace = true
|
|||
|
||||
[dependencies]
|
||||
tracing.workspace = true
|
||||
walkdir = "2.3.2"
|
||||
walkdir = "2.5.0"
|
||||
crossbeam-channel.workspace = true
|
||||
notify = "8.0.0"
|
||||
rayon = "1.10.0"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue