Skip to content

Upgrade to [email protected], add CARGO_WORKSPACE_DIR env var #12817

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.

Sign up for GitHub

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 2 commits into from
Jul 19, 2022
Merged

Upgrade to [email protected], add CARGO_WORKSPACE_DIR env var #12817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b41647
Upgrade to [email protected]
fasterthanlime Jul 19, 2022
307be7c
Add CARGO_WORKSPACE_DIR env var in `.cargo/config.toml`
fasterthanlime Jul 19, 2022
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
3 changes: 3 additions & 0 deletions .cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion crates/cfg/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion crates/hir-def/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion crates/hir-expand/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion crates/hir-ty/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion crates/ide-assists/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion crates/ide-completion/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion crates/ide-db/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion crates/ide-diagnostics/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion crates/ide-ssr/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion crates/ide/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion crates/parser/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion crates/proc-macro-srv/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion crates/project-model/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion crates/rust-analyzer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion crates/syntax/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down