Skip to content
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

Jump to bottom

Update cargo rls #68221

Merged
merged 2 commits into from
Jan 15, 2020
Merged

Update cargo rls #68221

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
6da85d6
Update cargo, rls
ehuss Jan 14, 2020
55cb505
Update rustfix in compiletest.
ehuss Jan 14, 2020
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
32 changes: 25 additions & 7 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ dependencies = [
"winapi 0.3.8",
]

[[package]]
name = "anyhow"
version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c"

[[package]]
name = "arc-swap"
version = "0.3.7"
Expand Down Expand Up @@ -277,6 +283,7 @@ dependencies = [
name = "cargo"
version = "0.43.0"
dependencies = [
"anyhow",
"atty",
"bytesize",
"cargo-platform",
Expand All @@ -290,7 +297,6 @@ dependencies = [
"curl",
"curl-sys",
"env_logger 0.7.1",
"failure",
"filetime",
"flate2",
"fs2",
Expand Down Expand Up @@ -318,7 +324,7 @@ dependencies = [
"pretty_env_logger",
"remove_dir_all",
"rustc-workspace-hack",
"rustfix",
"rustfix 0.5.0",
"same-file",
"semver",
"serde",
Expand Down Expand Up @@ -590,7 +596,7 @@ dependencies = [
"log",
"miow 0.3.3",
"regex",
"rustfix",
"rustfix 0.5.0",
"serde",
"serde_json",
"walkdir",
Expand All @@ -610,7 +616,7 @@ dependencies = [
"log",
"miow 0.3.3",
"regex",
"rustfix",
"rustfix 0.4.6",
"serde",
"serde_derive",
"serde_json",
Expand Down Expand Up @@ -694,10 +700,10 @@ checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"

[[package]]
name = "crates-io"
version = "0.30.0"
version = "0.31.0"
dependencies = [
"anyhow",
"curl",
"failure",
"percent-encoding 2.1.0",
"serde",
"serde_derive",
Expand Down Expand Up @@ -2936,13 +2942,13 @@ dependencies = [
name = "rls"
version = "1.41.0"
dependencies = [
"anyhow",
"cargo",
"cargo_metadata 0.8.0",
"clippy_lints",
"crossbeam-channel",
"difference",
"env_logger 0.7.1",
"failure",
"futures",
"heck",
"home",
Expand Down Expand Up @@ -4005,6 +4011,18 @@ dependencies = [
"serde_json",
]

[[package]]
name = "rustfix"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "804b11883a5ce0ad0378fbf95a8dea59ee6b51c331a73b8f471b6bdaa3bd40c1"
dependencies = [
"anyhow",
"log",
"serde",
"serde_json",
]

[[package]]
name = "rustfmt-config_proc_macro"
version = "0.2.0"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Open in desktop
Submodule cargo updated 113 files
2 changes: 1 addition & 1 deletion src/tools/compiletest/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ log = "0.4"
regex = "1.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
rustfix = "0.4.1"
rustfix = "0.5.0"
lazy_static = "1.0"
walkdir = "2"

Expand Down
2 changes: 1 addition & 1 deletion src/tools/rls
Open in desktop
Submodule rls updated from 7c0489 to b27e11
2 changes: 1 addition & 1 deletion src/tools/rustc-workspace-hack/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ serde_json = { version = "1.0.31", features = ["raw_value"] }
smallvec-0_6 = { package = "smallvec", version = "0.6", features = ['union', 'may_dangle'] }
smallvec = { version = "1.0", features = ['union', 'may_dangle'] }
url = { version = "2.0", features = ['serde'] }
syn = { version = "0.15", features = ['full'] }
syn = { version = "0.15", features = ['full', 'extra-traits'] }

[target.'cfg(not(windows))'.dependencies]
openssl = { version = "0.10.12", optional = true }
Expand Down