diff --git a/.cargo/config.toml b/.cargo/config.toml index 982c78cd250d1..24745d1c806fe 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -6,3 +6,6 @@ lint = "clippy --all-targets -- -Aclippy::collapsible_if -Aclippy::needless_pass [target.x86_64-pc-windows-msvc] linker = "rust-lld" + +[env] +CARGO_WORKSPACE_DIR = { value = "", relative = true } \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index fceaa0797c464..a960012c8cff8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -350,9 +350,9 @@ dependencies = [ [[package]] name = "expect-test" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dced95c9dcd4e3241f95841aad395f9c8d7933a3b0b524bdeb2440885c72a271" +checksum = "1d4661aca38d826eb7c72fe128e4238220616de4c0cc00db7bfc38e2e1364dd3" dependencies = [ "dissimilar", "once_cell", diff --git a/crates/cfg/Cargo.toml b/crates/cfg/Cargo.toml index 9db9bfdb6a41b..c9664a83ab863 100644 --- a/crates/cfg/Cargo.toml +++ b/crates/cfg/Cargo.toml @@ -17,7 +17,7 @@ tt = { path = "../tt", version = "0.0.0" } [dev-dependencies] mbe = { path = "../mbe" } syntax = { path = "../syntax" } -expect-test = "1.3.0" +expect-test = "1.4.0" oorandom = "11.1.3" # 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` diff --git a/crates/hir-def/Cargo.toml b/crates/hir-def/Cargo.toml index 35a18e4bebf58..e8cff2f3e6cd7 100644 --- a/crates/hir-def/Cargo.toml +++ b/crates/hir-def/Cargo.toml @@ -40,4 +40,4 @@ limit = { path = "../limit", version = "0.0.0" } [dev-dependencies] test-utils = { path = "../test-utils" } -expect-test = "1.3.0" +expect-test = "1.4.0" diff --git a/crates/hir-expand/Cargo.toml b/crates/hir-expand/Cargo.toml index 1fcc8287ed6ed..dfd470ffca6ac 100644 --- a/crates/hir-expand/Cargo.toml +++ b/crates/hir-expand/Cargo.toml @@ -31,4 +31,4 @@ mbe = { path = "../mbe", version = "0.0.0" } limit = { path = "../limit", version = "0.0.0" } [dev-dependencies] -expect-test = "1.3.0" +expect-test = "1.4.0" diff --git a/crates/hir-ty/Cargo.toml b/crates/hir-ty/Cargo.toml index d359cb0ed1451..5cd444c1ad3bd 100644 --- a/crates/hir-ty/Cargo.toml +++ b/crates/hir-ty/Cargo.toml @@ -35,7 +35,7 @@ limit = { path = "../limit", version = "0.0.0" } [dev-dependencies] test-utils = { path = "../test-utils" } -expect-test = "1.3.0" +expect-test = "1.4.0" tracing = "0.1.35" tracing-subscriber = { version = "0.3.14", default-features = false, features = [ "env-filter", diff --git a/crates/ide-assists/Cargo.toml b/crates/ide-assists/Cargo.toml index bc3e9a3229af8..51e43d21cb03d 100644 --- a/crates/ide-assists/Cargo.toml +++ b/crates/ide-assists/Cargo.toml @@ -25,4 +25,4 @@ hir = { path = "../hir", version = "0.0.0" } [dev-dependencies] test-utils = { path = "../test-utils" } sourcegen = { path = "../sourcegen" } -expect-test = "1.3.0" +expect-test = "1.4.0" diff --git a/crates/ide-completion/Cargo.toml b/crates/ide-completion/Cargo.toml index adca75c2a1e9b..8c9d6b228648e 100644 --- a/crates/ide-completion/Cargo.toml +++ b/crates/ide-completion/Cargo.toml @@ -28,6 +28,6 @@ profile = { path = "../profile", version = "0.0.0" } hir = { path = "../hir", version = "0.0.0" } [dev-dependencies] -expect-test = "1.3.0" +expect-test = "1.4.0" test-utils = { path = "../test-utils" } diff --git a/crates/ide-db/Cargo.toml b/crates/ide-db/Cargo.toml index e3ed054a0e129..a1b0bd6cb3044 100644 --- a/crates/ide-db/Cargo.toml +++ b/crates/ide-db/Cargo.toml @@ -36,4 +36,4 @@ limit = { path = "../limit", version = "0.0.0" } test-utils = { path = "../test-utils" } sourcegen = { path = "../sourcegen" } xshell = "0.2.2" -expect-test = "1.3.0" +expect-test = "1.4.0" diff --git a/crates/ide-diagnostics/Cargo.toml b/crates/ide-diagnostics/Cargo.toml index 73093a23a9bd6..a79adca4cdba7 100644 --- a/crates/ide-diagnostics/Cargo.toml +++ b/crates/ide-diagnostics/Cargo.toml @@ -25,7 +25,7 @@ hir = { path = "../hir", version = "0.0.0" } ide-db = { path = "../ide-db", version = "0.0.0" } [dev-dependencies] -expect-test = "1.3.0" +expect-test = "1.4.0" test-utils = { path = "../test-utils" } sourcegen = { path = "../sourcegen" } diff --git a/crates/ide-ssr/Cargo.toml b/crates/ide-ssr/Cargo.toml index 20e02d478250d..d36dd02d45c59 100644 --- a/crates/ide-ssr/Cargo.toml +++ b/crates/ide-ssr/Cargo.toml @@ -23,4 +23,4 @@ hir = { path = "../hir", version = "0.0.0" } [dev-dependencies] test-utils = { path = "../test-utils" } -expect-test = "1.3.0" +expect-test = "1.4.0" diff --git a/crates/ide/Cargo.toml b/crates/ide/Cargo.toml index a0e4278c7b294..95a54b75e2850 100644 --- a/crates/ide/Cargo.toml +++ b/crates/ide/Cargo.toml @@ -41,4 +41,4 @@ toolchain = { path = "../toolchain", version = "0.0.0" } [dev-dependencies] test-utils = { path = "../test-utils" } -expect-test = "1.3.0" +expect-test = "1.4.0" diff --git a/crates/parser/Cargo.toml b/crates/parser/Cargo.toml index 8b9a4c2d89914..a286a6bcdddec 100644 --- a/crates/parser/Cargo.toml +++ b/crates/parser/Cargo.toml @@ -15,5 +15,5 @@ rustc_lexer = { version = "725.0.0", package = "rustc-ap-rustc_lexer" } limit = { path = "../limit", version = "0.0.0" } [dev-dependencies] -expect-test = "1.3.0" +expect-test = "1.4.0" sourcegen = { path = "../sourcegen" } diff --git a/crates/proc-macro-srv/Cargo.toml b/crates/proc-macro-srv/Cargo.toml index ec2d41170ac7b..ce1fa0063f8ea 100644 --- a/crates/proc-macro-srv/Cargo.toml +++ b/crates/proc-macro-srv/Cargo.toml @@ -26,7 +26,7 @@ paths = { path = "../paths", version = "0.0.0" } proc-macro-api = { path = "../proc-macro-api", version = "0.0.0" } [dev-dependencies] -expect-test = "1.3.0" +expect-test = "1.4.0" # used as proc macro test targets proc-macro-test = { path = "../proc-macro-test" } diff --git a/crates/project-model/Cargo.toml b/crates/project-model/Cargo.toml index 84b239b3e2924..bc75d6faa383f 100644 --- a/crates/project-model/Cargo.toml +++ b/crates/project-model/Cargo.toml @@ -17,7 +17,7 @@ semver = "1.0.10" serde = { version = "1.0.137", features = ["derive"] } serde_json = "1.0.81" anyhow = "1.0.57" -expect-test = "1.3.0" +expect-test = "1.4.0" la-arena = { version = "0.3.0", path = "../../lib/la-arena" } cfg = { path = "../cfg", version = "0.0.0" } diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index 7e69bcbaf14a2..c37a0d17491d2 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/crates/rust-analyzer/Cargo.toml @@ -73,7 +73,7 @@ winapi = "0.3.9" jemallocator = { version = "0.5.0", package = "tikv-jemallocator", optional = true } [dev-dependencies] -expect-test = "1.3.0" +expect-test = "1.4.0" jod-thread = "0.1.2" xshell = "0.2.2" diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml index dbecfdd218567..1ff3170a74f45 100644 --- a/crates/syntax/Cargo.toml +++ b/crates/syntax/Cargo.toml @@ -27,7 +27,7 @@ profile = { path = "../profile", version = "0.0.0" } [dev-dependencies] rayon = "1.5.3" -expect-test = "1.3.0" +expect-test = "1.4.0" proc-macro2 = "1.0.39" quote = "1.0.20" ungrammar = "1.16.1"