From 32101ad3b38d29291a5150840e88aeef2fb911a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= <matti@marinelayer.io>
Date: Thu, 22 Aug 2019 12:28:03 +0200
Subject: [PATCH 1/6] Upgrade rand to 0.7
---
Cargo.lock | 13 +++++++------
src/librustc_incremental/Cargo.toml | 2 +-
src/libstd/Cargo.toml | 2 +-
src/libstd/fs.rs | 2 +-
src/libstd/tests/env.rs | 2 +-
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 313fef1c086a8..43eb28168086a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1151,12 +1151,13 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.1.8"
+version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34f33de6f0ae7c9cb5e574502a562e2b512799e32abb801cd1e79ad952b62b49"
+checksum = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571"
dependencies = [
"cfg-if",
"libc",
+ "wasi",
]
[[package]]
@@ -1583,9 +1584,9 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
[[package]]
name = "libc"
-version = "0.2.61"
+version = "0.2.62"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c665266eb592905e8503ba3403020f4b8794d26263f412ca33171600eca9a6fa"
+checksum = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
dependencies = [
"rustc-std-workspace-core",
]
@@ -3248,7 +3249,7 @@ version = "0.0.0"
dependencies = [
"graphviz",
"log",
- "rand 0.6.1",
+ "rand 0.7.0",
"rustc",
"rustc_data_structures",
"rustc_fs_util",
@@ -3864,7 +3865,7 @@ dependencies = [
"panic_abort",
"panic_unwind",
"profiler_builtins",
- "rand 0.6.1",
+ "rand 0.7.0",
"rustc_asan",
"rustc_lsan",
"rustc_msan",
diff --git a/src/librustc_incremental/Cargo.toml b/src/librustc_incremental/Cargo.toml
index a931ad3b66e21..659c4c89fe33c 100644
--- a/src/librustc_incremental/Cargo.toml
+++ b/src/librustc_incremental/Cargo.toml
@@ -12,7 +12,7 @@ doctest = false
[dependencies]
graphviz = { path = "../libgraphviz" }
log = "0.4"
-rand = "0.6"
+rand = "0.7"
rustc = { path = "../librustc" }
rustc_data_structures = { path = "../librustc_data_structures" }
rustc_serialize = { path = "../libserialize", package = "serialize" }
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
index 18a46cf0b5257..a34ab598aed94 100644
--- a/src/libstd/Cargo.toml
+++ b/src/libstd/Cargo.toml
@@ -38,7 +38,7 @@ features = [
optional = true
[dev-dependencies]
-rand = "0.6.1"
+rand = "0.7"
[target.x86_64-apple-darwin.dependencies]
rustc_asan = { path = "../librustc_asan" }
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs
index 5f76875bd66c4..b14e02a2cb478 100644
--- a/src/libstd/fs.rs
+++ b/src/libstd/fs.rs
@@ -2144,7 +2144,7 @@ mod tests {
use crate::sys_common::io::test::{TempDir, tmpdir};
use crate::thread;
- use rand::{rngs::StdRng, FromEntropy, RngCore};
+ use rand::{rngs::StdRng, RngCore, SeedableRng};
#[cfg(windows)]
use crate::os::windows::fs::{symlink_dir, symlink_file};
diff --git a/src/libstd/tests/env.rs b/src/libstd/tests/env.rs
index 06fb5533afdd8..f8014cb2ad9af 100644
--- a/src/libstd/tests/env.rs
+++ b/src/libstd/tests/env.rs
@@ -5,7 +5,7 @@ use rand::{thread_rng, Rng};
use rand::distributions::Alphanumeric;
fn make_rand_name() -> OsString {
- let mut rng = thread_rng();
+ let rng = thread_rng();
let n = format!("TEST{}", rng.sample_iter(&Alphanumeric).take(10)
.collect::<String>());
let n = OsString::from(n);
From 9a561872c419d3bc0c8ac9d13942f73535df27c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Esteban=20K=C3=BCber?= <esteban@kuber.com.ar>
Date: Sun, 1 Sep 2019 00:01:25 -0700
Subject: [PATCH 2/6] Always emit unresolved import errors and hide unused
import lint
---
src/librustc_resolve/resolve_imports.rs | 89 ++++++++++++-------
src/test/ui/extenv/issue-55897.rs | 2 +-
src/test/ui/extenv/issue-55897.stderr | 8 +-
.../ui/imports/unresolved-imports-used.rs | 8 +-
.../ui/imports/unresolved-imports-used.stderr | 26 +++++-
.../ui/rust-2018/uniform-paths/deadlock.rs | 2 +-
.../rust-2018/uniform-paths/deadlock.stderr | 6 +-
7 files changed, 96 insertions(+), 45 deletions(-)
diff --git a/src/librustc_resolve/resolve_imports.rs b/src/librustc_resolve/resolve_imports.rs
index 132690dcd7df2..eb509f1a01d67 100644
--- a/src/librustc_resolve/resolve_imports.rs
+++ b/src/librustc_resolve/resolve_imports.rs
@@ -71,7 +71,7 @@ pub enum ImportDirectiveSubclass<'a> {
}
/// One import directive.
-#[derive(Debug,Clone)]
+#[derive(Debug, Clone)]
crate struct ImportDirective<'a> {
/// The ID of the `extern crate`, `UseTree` etc that imported this `ImportDirective`.
///
@@ -447,12 +447,13 @@ impl<'a> Resolver<'a> {
}
// Define the name or return the existing binding if there is a collision.
- pub fn try_define(&mut self,
- module: Module<'a>,
- ident: Ident,
- ns: Namespace,
- binding: &'a NameBinding<'a>)
- -> Result<(), &'a NameBinding<'a>> {
+ pub fn try_define(
+ &mut self,
+ module: Module<'a>,
+ ident: Ident,
+ ns: Namespace,
+ binding: &'a NameBinding<'a>,
+ ) -> Result<(), &'a NameBinding<'a>> {
let res = binding.res();
self.check_reserved_macro_name(ident, res);
self.set_binding_parent_module(binding, module);
@@ -480,8 +481,11 @@ impl<'a> Resolver<'a> {
};
if glob_binding.res() != nonglob_binding.res() &&
ns == MacroNS && nonglob_binding.expansion != ExpnId::root() {
- resolution.binding = Some(this.ambiguity(AmbiguityKind::GlobVsExpanded,
- nonglob_binding, glob_binding));
+ resolution.binding = Some(this.ambiguity(
+ AmbiguityKind::GlobVsExpanded,
+ nonglob_binding,
+ glob_binding,
+ ));
} else {
resolution.binding = Some(nonglob_binding);
}
@@ -513,9 +517,11 @@ impl<'a> Resolver<'a> {
})
}
- fn ambiguity(&self, kind: AmbiguityKind,
- primary_binding: &'a NameBinding<'a>, secondary_binding: &'a NameBinding<'a>)
- -> &'a NameBinding<'a> {
+ fn ambiguity(
+ &self, kind: AmbiguityKind,
+ primary_binding: &'a NameBinding<'a>,
+ secondary_binding: &'a NameBinding<'a>,
+ ) -> &'a NameBinding<'a> {
self.arenas.alloc_name_binding(NameBinding {
ambiguity: Some((secondary_binding, kind)),
..primary_binding.clone()
@@ -524,8 +530,12 @@ impl<'a> Resolver<'a> {
// Use `f` to mutate the resolution of the name in the module.
// If the resolution becomes a success, define it in the module's glob importers.
- fn update_resolution<T, F>(&mut self, module: Module<'a>, ident: Ident, ns: Namespace, f: F)
- -> T
+ fn update_resolution<T, F>(
+ &mut self, module: Module<'a>,
+ ident: Ident,
+ ns: Namespace,
+ f: F,
+ ) -> T
where F: FnOnce(&mut Resolver<'a>, &mut NameResolution<'a>) -> T
{
// Ensure that `resolution` isn't borrowed when defining in the module's glob importers,
@@ -627,14 +637,18 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
self.finalize_resolutions_in(module);
}
- let mut has_errors = false;
let mut seen_spans = FxHashSet::default();
let mut errors = vec![];
let mut prev_root_id: NodeId = NodeId::from_u32(0);
- for i in 0 .. self.r.determined_imports.len() {
- let import = self.r.determined_imports[i];
+ let determined_imports = mem::take(&mut self.r.determined_imports);
+ let indeterminate_imports = mem::take(&mut self.r.indeterminate_imports);
+
+ for (is_indeterminate, import) in determined_imports
+ .into_iter()
+ .map(|i| (false, i))
+ .chain(indeterminate_imports.into_iter().map(|i| (true, i)))
+ {
if let Some(err) = self.finalize_import(import) {
- has_errors = true;
if let SingleImport { source, ref source_bindings, .. } = import.subclass {
if source.name == kw::SelfLower {
@@ -666,25 +680,27 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
errors.push((path, err));
prev_root_id = import.root_id;
}
+ } else if is_indeterminate {
+ // Consider erroneous imports used to avoid duplicate diagnostics.
+ self.r.used_imports.insert((import.id, TypeNS));
+ let path = import_path_to_string(
+ &import.module_path.iter().map(|seg| seg.ident).collect::<Vec<_>>(),
+ &import.subclass,
+ import.span,
+ );
+ let err = UnresolvedImportError {
+ span: import.span,
+ label: None,
+ note: Vec::new(),
+ suggestion: None,
+ };
+ errors.push((path, err));
}
}
if !errors.is_empty() {
self.throw_unresolved_import_error(errors.clone(), None);
}
-
- for import in &self.r.indeterminate_imports {
- // Consider erroneous imports used to avoid duplicate diagnostics.
- self.r.used_imports.insert((import.id, TypeNS));
- }
- // Report unresolved imports only if no hard error was already reported
- // to avoid generating multiple errors on the same import.
- if !has_errors {
- for import in &self.r.indeterminate_imports {
- self.throw_unresolved_import_error(errors, Some(MultiSpan::from(import.span)));
- break;
- }
- }
}
fn throw_unresolved_import_error(
@@ -839,8 +855,14 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
) -> Option<UnresolvedImportError> {
let orig_vis = directive.vis.replace(ty::Visibility::Invisible);
let prev_ambiguity_errors_len = self.r.ambiguity_errors.len();
- let path_res = self.r.resolve_path(&directive.module_path, None, &directive.parent_scope,
- true, directive.span, directive.crate_lint());
+ let path_res = self.r.resolve_path(
+ &directive.module_path,
+ None,
+ &directive.parent_scope,
+ true,
+ directive.span,
+ directive.crate_lint(),
+ );
let no_ambiguity = self.r.ambiguity_errors.len() == prev_ambiguity_errors_len;
directive.vis.set(orig_vis);
if let PathResult::Failed { .. } | PathResult::NonModule(..) = path_res {
@@ -903,7 +925,6 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
}
}
};
-
return Some(err);
}
return None;
diff --git a/src/test/ui/extenv/issue-55897.rs b/src/test/ui/extenv/issue-55897.rs
index c3975f6b9255e..64c4107e89875 100644
--- a/src/test/ui/extenv/issue-55897.rs
+++ b/src/test/ui/extenv/issue-55897.rs
@@ -1,7 +1,7 @@
use prelude::*; //~ ERROR unresolved import `prelude`
mod unresolved_env {
- use env;
+ use env; //~ ERROR unresolved import `env`
include!(concat!(env!("NON_EXISTENT"), "/data.rs"));
//~^ ERROR cannot determine resolution for the macro `env`
diff --git a/src/test/ui/extenv/issue-55897.stderr b/src/test/ui/extenv/issue-55897.stderr
index 9d68131beabd7..c57a467cdba56 100644
--- a/src/test/ui/extenv/issue-55897.stderr
+++ b/src/test/ui/extenv/issue-55897.stderr
@@ -19,6 +19,12 @@ LL | use prelude::*;
| unresolved import
| help: a similar path exists: `std::prelude`
+error[E0432]: unresolved import `env`
+ --> $DIR/issue-55897.rs:4:9
+ |
+LL | use env;
+ | ^^^ no `env` in the root
+
error: cannot determine resolution for the macro `env`
--> $DIR/issue-55897.rs:6:22
|
@@ -27,6 +33,6 @@ LL | include!(concat!(env!("NON_EXISTENT"), "/data.rs"));
|
= note: import resolution is stuck, try simplifying macro imports
-error: aborting due to 4 previous errors
+error: aborting due to 5 previous errors
For more information about this error, try `rustc --explain E0432`.
diff --git a/src/test/ui/imports/unresolved-imports-used.rs b/src/test/ui/imports/unresolved-imports-used.rs
index 5398dd63c8929..75cf880192c8e 100644
--- a/src/test/ui/imports/unresolved-imports-used.rs
+++ b/src/test/ui/imports/unresolved-imports-used.rs
@@ -8,11 +8,11 @@ mod qux {
use qux::quz; //~ ERROR function `quz` is private
use qux::bar; //~ ERROR unresolved import `qux::bar`
-use foo::bar;
-use baz::*;
+use foo::bar; //~ ERROR unresolved import `foo`
+use baz::*; //~ ERROR unresolved import `baz`
use qux::bar2; //~ ERROR unresolved import `qux::bar2`
-use foo2::bar2;
-use baz2::*;
+use foo2::bar2;//~ ERROR unresolved import `foo2`
+use baz2::*; //~ ERROR unresolved import `baz2`
use qux::quy; //~ ERROR unused import
fn main() {}
diff --git a/src/test/ui/imports/unresolved-imports-used.stderr b/src/test/ui/imports/unresolved-imports-used.stderr
index c9342d17a49d7..b341e8e059288 100644
--- a/src/test/ui/imports/unresolved-imports-used.stderr
+++ b/src/test/ui/imports/unresolved-imports-used.stderr
@@ -10,6 +10,30 @@ error[E0432]: unresolved import `qux::bar2`
LL | use qux::bar2;
| ^^^^^^^^^ no `bar2` in `qux`
+error[E0432]: unresolved import `foo`
+ --> $DIR/unresolved-imports-used.rs:11:5
+ |
+LL | use foo::bar;
+ | ^^^ maybe a missing crate `foo`?
+
+error[E0432]: unresolved import `baz`
+ --> $DIR/unresolved-imports-used.rs:12:5
+ |
+LL | use baz::*;
+ | ^^^ maybe a missing crate `baz`?
+
+error[E0432]: unresolved import `foo2`
+ --> $DIR/unresolved-imports-used.rs:14:5
+ |
+LL | use foo2::bar2;
+ | ^^^^ maybe a missing crate `foo2`?
+
+error[E0432]: unresolved import `baz2`
+ --> $DIR/unresolved-imports-used.rs:15:5
+ |
+LL | use baz2::*;
+ | ^^^^ maybe a missing crate `baz2`?
+
error[E0603]: function `quz` is private
--> $DIR/unresolved-imports-used.rs:9:10
|
@@ -28,7 +52,7 @@ note: lint level defined here
LL | #![deny(unused_imports)]
| ^^^^^^^^^^^^^^
-error: aborting due to 4 previous errors
+error: aborting due to 8 previous errors
Some errors have detailed explanations: E0432, E0603.
For more information about an error, try `rustc --explain E0432`.
diff --git a/src/test/ui/rust-2018/uniform-paths/deadlock.rs b/src/test/ui/rust-2018/uniform-paths/deadlock.rs
index 3228d799083fb..83ed70a0459a8 100644
--- a/src/test/ui/rust-2018/uniform-paths/deadlock.rs
+++ b/src/test/ui/rust-2018/uniform-paths/deadlock.rs
@@ -1,7 +1,7 @@
// edition:2018
// compile-flags:--extern foo --extern bar
-use foo::bar; //~ ERROR unresolved import
+use foo::bar; //~ ERROR can't find crate for `foo`
use bar::foo;
fn main() {}
diff --git a/src/test/ui/rust-2018/uniform-paths/deadlock.stderr b/src/test/ui/rust-2018/uniform-paths/deadlock.stderr
index b4ac15c588ebd..9336e90afb71d 100644
--- a/src/test/ui/rust-2018/uniform-paths/deadlock.stderr
+++ b/src/test/ui/rust-2018/uniform-paths/deadlock.stderr
@@ -1,9 +1,9 @@
-error[E0432]: unresolved import
+error[E0463]: can't find crate for `foo`
--> $DIR/deadlock.rs:4:5
|
LL | use foo::bar;
- | ^^^^^^^^
+ | ^^^ can't find crate
error: aborting due to previous error
-For more information about this error, try `rustc --explain E0432`.
+For more information about this error, try `rustc --explain E0463`.
From 91dae2e233d6b468731eaa8908794d0a7e4e876d Mon Sep 17 00:00:00 2001
From: Igor Matuszewski <Xanewok@gmail.com>
Date: Sun, 8 Sep 2019 10:28:01 +0200
Subject: [PATCH 3/6] Bump RLS and Rustfmt submodules
---
src/tools/rls | 2 +-
src/tools/rustfmt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/tools/rls b/src/tools/rls
index 496c892752213..412fb00b37afb 160000
--- a/src/tools/rls
+++ b/src/tools/rls
@@ -1 +1 @@
-Subproject commit 496c89275221303a4b0c2779cb8203fb3ce2a136
+Subproject commit 412fb00b37afb6b7f7fa96a35f2315c7e640b916
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
index f800ce47d1da2..afb1ee1c14594 160000
--- a/src/tools/rustfmt
+++ b/src/tools/rustfmt
@@ -1 +1 @@
-Subproject commit f800ce47d1da2a1c02ffd260deca8b7445f7facf
+Subproject commit afb1ee1c14594aed5bb4a762b357b01f13c9de10
From c2249a4bf996435803ad3f8fbe9fe45d9289e19f Mon Sep 17 00:00:00 2001
From: Igor Matuszewski <Xanewok@gmail.com>
Date: Sun, 8 Sep 2019 10:28:11 +0200
Subject: [PATCH 4/6] cargo update -p rustfmt-nightly
---
Cargo.lock | 523 ++++++++++++++++++++++++++++++++++++++---------------
1 file changed, 374 insertions(+), 149 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 108c2fbd8f503..beae224b500dc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -223,9 +223,9 @@ checksum = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40"
[[package]]
name = "bytecount"
-version = "0.5.1"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be0fdd54b507df8f22012890aadd099979befdba27713c767993f8380112ca7c"
+checksum = "b0017894339f586ccb943b01b9555de56770c11cda818e7e3d8bd93f4ed7f46e"
dependencies = [
"packed_simd",
]
@@ -287,7 +287,7 @@ dependencies = [
"git2-curl",
"glob",
"hex",
- "home 0.5.0",
+ "home",
"ignore",
"im-rc",
"jobserver",
@@ -309,7 +309,7 @@ dependencies = [
"same-file",
"semver",
"serde",
- "serde_ignored 0.1.0",
+ "serde_ignored",
"serde_json",
"shell-escape",
"strip-ansi-escapes",
@@ -392,9 +392,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "2.32.0"
+version = "2.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
+checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
dependencies = [
"ansi_term",
"atty",
@@ -753,9 +753,9 @@ checksum = "d2a368589465391e127e10c9e3a08efc8df66fd49b87dc8524c764bbe7f2ef82"
dependencies = [
"fnv",
"ident_case",
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
]
[[package]]
@@ -765,8 +765,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "244e8987bd4e174385240cde20a3657f607fb0797563c28255c353b5819a07b1"
dependencies = [
"darling_core",
- "quote",
- "syn",
+ "quote 0.6.12",
+ "syn 0.15.35",
]
[[package]]
@@ -781,9 +781,9 @@ version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ca414e896ae072546f4d789f452daaecf60ddee4c9df5dc6d5936d769e3d87c"
dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
]
[[package]]
@@ -792,10 +792,10 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f57d78cf3bd45270dad4e70c21ec77a960b36c7a841ff9db76aaa775a8fb871"
dependencies = [
- "proc-macro2",
- "quote",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
"rustc_version",
- "syn",
+ "syn 0.15.35",
]
[[package]]
@@ -953,9 +953,9 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
"synstructure",
]
@@ -1259,16 +1259,6 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
-[[package]]
-name = "home"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80dff82fb58cfbbc617fb9a9184b010be0529201553cda50ad04372bc2333aff"
-dependencies = [
- "scopeguard 0.3.3",
- "winapi 0.3.6",
-]
-
[[package]]
name = "home"
version = "0.5.0"
@@ -1288,9 +1278,9 @@ dependencies = [
"log",
"mac",
"markup5ever",
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
]
[[package]]
@@ -1528,11 +1518,30 @@ version = "0.11.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ad0485404155f45cce53a40d4b2d6ac356418300daed05273d9e26f91c390be"
+[[package]]
+name = "jsonrpc-client-transports"
+version = "13.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39577db48b004cffb4c5b8e5c9b993c177c52599ecbee88711e815acf65144db"
+dependencies = [
+ "failure",
+ "futures",
+ "jsonrpc-core",
+ "jsonrpc-pubsub",
+ "jsonrpc-server-utils",
+ "log",
+ "parity-tokio-ipc",
+ "serde",
+ "serde_json",
+ "tokio",
+ "url 1.7.2",
+]
+
[[package]]
name = "jsonrpc-core"
-version = "12.0.0"
+version = "13.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "288dca7f9713710a29e485076b9340156cb701edb46a881f5d0c31aa4f5b9143"
+checksum = "dd42951eb35079520ee29b7efbac654d85821b397ef88c8151600ef7e2d00217"
dependencies = [
"futures",
"log",
@@ -1541,6 +1550,70 @@ dependencies = [
"serde_json",
]
+[[package]]
+name = "jsonrpc-core-client"
+version = "13.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f047c10738edee7c3c6acf5241a0ce33df32ef9230c1a7fb03e4a77ee72c992f"
+dependencies = [
+ "jsonrpc-client-transports",
+]
+
+[[package]]
+name = "jsonrpc-derive"
+version = "13.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29f9149f785deaae92a4c834a9a1a83a4313b8cfedccf15362cd4cf039a64501"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
+]
+
+[[package]]
+name = "jsonrpc-ipc-server"
+version = "13.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "256c5e4292c17b4c2ecdf542299dc8e9d6b3939c075c54825570ad9317fe5751"
+dependencies = [
+ "jsonrpc-core",
+ "jsonrpc-server-utils",
+ "log",
+ "parity-tokio-ipc",
+ "parking_lot 0.9.0",
+ "tokio-service",
+]
+
+[[package]]
+name = "jsonrpc-pubsub"
+version = "13.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2c08b444cc0ed70263798834343d0ac875e664257df8079160f23ac1ea79446"
+dependencies = [
+ "jsonrpc-core",
+ "log",
+ "parking_lot 0.9.0",
+ "serde",
+]
+
+[[package]]
+name = "jsonrpc-server-utils"
+version = "13.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44561bfdd31401bad790527f1e951dde144f2341ddc3e1b859d32945e1a34eff"
+dependencies = [
+ "bytes",
+ "globset",
+ "jsonrpc-core",
+ "lazy_static 1.3.0",
+ "log",
+ "num_cpus",
+ "tokio",
+ "tokio-codec",
+ "unicase 2.4.0",
+]
+
[[package]]
name = "kernel32-sys"
version = "0.2.2"
@@ -1655,6 +1728,15 @@ dependencies = [
"scopeguard 0.3.3",
]
+[[package]]
+name = "lock_api"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc"
+dependencies = [
+ "scopeguard 1.0.0",
+]
+
[[package]]
name = "log"
version = "0.4.8"
@@ -1686,18 +1768,15 @@ dependencies = [
[[package]]
name = "lsp-types"
-version = "0.57.2"
+version = "0.60.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62b77309737b1e262b3bbf37ff8faa740562c633b14702afe9be85dbcb6f88a"
+checksum = "fe3edefcd66dde1f7f1df706f46520a3c93adc5ca4bc5747da6621195e894efd"
dependencies = [
"bitflags",
- "num-derive",
- "num-traits",
"serde",
- "serde_derive",
"serde_json",
- "url 1.7.2",
- "url_serde",
+ "serde_repr",
+ "url 2.1.0",
]
[[package]]
@@ -1800,7 +1879,7 @@ dependencies = [
"serde",
"serde_derive",
"serde_json",
- "structopt",
+ "structopt 0.2.18",
"url 1.7.2",
]
@@ -2033,18 +2112,6 @@ version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2"
-[[package]]
-name = "num-derive"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8af1847c907c2f04d7bfd572fb25bbb4385c637fe5be163cf2f8c5d778fe1e7d"
-dependencies = [
- "num-traits",
- "proc-macro2",
- "quote",
- "syn",
-]
-
[[package]]
name = "num-integer"
version = "0.1.39"
@@ -2178,14 +2245,43 @@ dependencies = [
"unwind",
]
+[[package]]
+name = "parity-tokio-ipc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8281bf4f1d6429573f89589bf68d89451c46750977a8264f8ea3edbabeba7947"
+dependencies = [
+ "bytes",
+ "futures",
+ "log",
+ "mio-named-pipes",
+ "miow 0.3.3",
+ "rand 0.7.0",
+ "tokio",
+ "tokio-named-pipes",
+ "tokio-uds",
+ "winapi 0.3.6",
+]
+
[[package]]
name = "parking_lot"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
dependencies = [
- "lock_api",
- "parking_lot_core",
+ "lock_api 0.1.3",
+ "parking_lot_core 0.4.0",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
+dependencies = [
+ "lock_api 0.3.1",
+ "parking_lot_core 0.6.2",
+ "rustc_version",
]
[[package]]
@@ -2201,6 +2297,21 @@ dependencies = [
"winapi 0.3.6",
]
+[[package]]
+name = "parking_lot_core"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
+dependencies = [
+ "cfg-if",
+ "cloudabi",
+ "libc",
+ "redox_syscall",
+ "rustc_version",
+ "smallvec",
+ "winapi 0.3.6",
+]
+
[[package]]
name = "percent-encoding"
version = "1.0.1"
@@ -2240,9 +2351,9 @@ checksum = "63120576c4efd69615b5537d3d052257328a4ca82876771d6944424ccfd9f646"
dependencies = [
"pest",
"pest_meta",
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
]
[[package]]
@@ -2355,6 +2466,26 @@ dependencies = [
"log",
]
+[[package]]
+name = "proc-macro-crate"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e10d4b51f154c8a7fb96fd6dad097cb74b863943ec010ac94b9fd1be8861fe1e"
+dependencies = [
+ "toml",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097"
+dependencies = [
+ "proc-macro2 1.0.3",
+ "quote 1.0.2",
+ "syn 1.0.5",
+]
+
[[package]]
name = "proc-macro2"
version = "0.4.30"
@@ -2364,6 +2495,15 @@ dependencies = [
"unicode-xid 0.1.0",
]
+[[package]]
+name = "proc-macro2"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e98a83a9f9b331f54b924e68a66acb1bb35cb01fb0a23645139967abefb697e8"
+dependencies = [
+ "unicode-xid 0.2.0",
+]
+
[[package]]
name = "proc_macro"
version = "0.0.0"
@@ -2416,14 +2556,23 @@ version = "0.6.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db"
dependencies = [
- "proc-macro2",
+ "proc-macro2 0.4.30",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+dependencies = [
+ "proc-macro2 1.0.3",
]
[[package]]
name = "racer"
-version = "2.1.25"
+version = "2.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0727b9d7baaf9e42851145545d7b980b5c1752bd16a4c77c925c5e573d0069d9"
+checksum = "dde22b84ab75220015cbd91240222402bf885cbe3a5dc856475771abb82533ae"
dependencies = [
"bitflags",
"clap",
@@ -2715,7 +2864,7 @@ checksum = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac"
[[package]]
name = "rls"
-version = "1.38.0"
+version = "1.39.0"
dependencies = [
"cargo",
"cargo_metadata",
@@ -2726,7 +2875,7 @@ dependencies = [
"failure",
"futures",
"heck",
- "home 0.3.3",
+ "home",
"itertools 0.8.0",
"jsonrpc-core",
"lazy_static 1.3.0",
@@ -2741,6 +2890,7 @@ dependencies = [
"regex",
"rls-analysis",
"rls-data",
+ "rls-ipc",
"rls-rustc",
"rls-span",
"rls-vfs",
@@ -2750,14 +2900,14 @@ dependencies = [
"rustfmt-nightly",
"serde",
"serde_derive",
- "serde_ignored 0.0.4",
+ "serde_ignored",
"serde_json",
"tempfile",
"tokio",
"tokio-process",
"tokio-timer",
"toml",
- "url 1.7.2",
+ "url 2.1.0",
"walkdir",
]
@@ -2788,9 +2938,33 @@ dependencies = [
"serde",
]
+[[package]]
+name = "rls-ipc"
+version = "0.1.0"
+dependencies = [
+ "jsonrpc-core",
+ "jsonrpc-core-client",
+ "jsonrpc-derive",
+ "jsonrpc-ipc-server",
+ "rls-data",
+ "serde",
+]
+
[[package]]
name = "rls-rustc"
version = "0.6.0"
+dependencies = [
+ "clippy_lints",
+ "env_logger",
+ "failure",
+ "futures",
+ "log",
+ "rand 0.6.1",
+ "rls-data",
+ "rls-ipc",
+ "serde",
+ "tokio",
+]
[[package]]
name = "rls-span"
@@ -2837,7 +3011,7 @@ dependencies = [
"log",
"measureme",
"num_cpus",
- "parking_lot",
+ "parking_lot 0.7.1",
"polonius-engine",
"rustc-rayon",
"rustc-rayon-core",
@@ -2856,9 +3030,9 @@ dependencies = [
[[package]]
name = "rustc-ap-arena"
-version = "546.0.0"
+version = "583.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dc2e1e68b64268c543bfa6e63e3c0d9ea58074c71396f42f76931f35a9287f9"
+checksum = "f59b76d334bd533f3fdc5c651c27678c5e80fac67c6f7da22ba21a58878c55f5"
dependencies = [
"rustc-ap-rustc_data_structures",
"smallvec",
@@ -2866,15 +3040,15 @@ dependencies = [
[[package]]
name = "rustc-ap-graphviz"
-version = "546.0.0"
+version = "583.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c108d647ce0dd46477b048eafff5a6273b5652e02d47424b0cd684147379c811"
+checksum = "3e632ef08ca17458acfd46d2ead3d541a1c249586cd5329f5fe333dacfab6142"
[[package]]
name = "rustc-ap-rustc_data_structures"
-version = "546.0.0"
+version = "583.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "656771744e0783cb8e4481e3b8b1f975687610aaf18833b898018111a0e0e582"
+checksum = "e89e2c7be68185418f3cd56af3df8b29007a59a1cebefa63612d055f9bcb1a36"
dependencies = [
"cfg-if",
"crossbeam-utils 0.6.5",
@@ -2883,7 +3057,7 @@ dependencies = [
"jobserver",
"lazy_static 1.3.0",
"log",
- "parking_lot",
+ "parking_lot 0.7.1",
"rustc-ap-graphviz",
"rustc-ap-serialize",
"rustc-hash",
@@ -2895,9 +3069,9 @@ dependencies = [
[[package]]
name = "rustc-ap-rustc_errors"
-version = "546.0.0"
+version = "583.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e37064f6624bc799bfaa2968b61ee6880926dea2a8bba69f18aef6c8e69c9604"
+checksum = "1e47cb380abeb72b01e42b2342d592f7eeea7d536c2f1f0d0e550dc509e46333"
dependencies = [
"annotate-snippets",
"atty",
@@ -2905,34 +3079,38 @@ dependencies = [
"rustc-ap-rustc_data_structures",
"rustc-ap-serialize",
"rustc-ap-syntax_pos",
+ "term_size",
"termcolor",
"unicode-width",
]
[[package]]
name = "rustc-ap-rustc_lexer"
-version = "546.0.0"
+version = "583.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef5bc0a971823637ea23a857f0ef1467f44b1e05d71968821f83a0abe53e0fe3"
+checksum = "494cfaf67f49217d67d0774eeecbba61ac89acf478db97ef11f113ed8a959305"
+dependencies = [
+ "unicode-xid 0.2.0",
+]
[[package]]
name = "rustc-ap-rustc_macros"
-version = "546.0.0"
+version = "583.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b90037e3336fe8835f468db44d0848ae10d9cc8533ae89b55828883f905b7e80"
+checksum = "e2e5d36becc59b4497f9cbd3ae0610081de0207a1d0e95c066369167b14f486f"
dependencies = [
"itertools 0.8.0",
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
"synstructure",
]
[[package]]
name = "rustc-ap-rustc_target"
-version = "546.0.0"
+version = "583.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cadf9ca07315eab3a7a21f63872f9cc81e250fd6ede0419c24f8926ade73a45d"
+checksum = "a7bfc5f96dfc3b9f8d5b57884f7f37467ecff6776cd4b8b491a7daece6fdd7c2"
dependencies = [
"bitflags",
"log",
@@ -2943,9 +3121,9 @@ dependencies = [
[[package]]
name = "rustc-ap-serialize"
-version = "546.0.0"
+version = "583.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61673783f2089e01033ffa82d1988f55175402071b31253a358292e1624d4602"
+checksum = "2bb9ee231cf79eded39c56647499f83d6136ff5c8c0baaa9e21b6febee00f4f6"
dependencies = [
"indexmap",
"smallvec",
@@ -2953,9 +3131,9 @@ dependencies = [
[[package]]
name = "rustc-ap-syntax"
-version = "546.0.0"
+version = "583.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28f3dd1346d5b0269c07a4a78855e309a298ab569c9c1302d4d4f57f8eee4e84"
+checksum = "b3827fc208814efbde82d613e31d11b4250ce9e8cf8afe4a4d47bbbd099632c9"
dependencies = [
"bitflags",
"lazy_static 1.3.0",
@@ -2973,9 +3151,9 @@ dependencies = [
[[package]]
name = "rustc-ap-syntax_pos"
-version = "546.0.0"
+version = "583.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45e67b526dbda3a0c7dab91c8947d43685e7697f52686a4949da3c179cd7c979"
+checksum = "930ed81c34f325e512cc315c04d676fa84a373879d5c43bb54054a0522b05213"
dependencies = [
"cfg-if",
"rustc-ap-arena",
@@ -3071,13 +3249,13 @@ version = "1.0.0"
dependencies = [
"byteorder",
"crossbeam-utils 0.6.5",
- "parking_lot",
+ "parking_lot 0.7.1",
"rand 0.6.1",
"scopeguard 0.3.3",
"serde",
"serde_json",
"smallvec",
- "syn",
+ "syn 0.15.35",
"winapi 0.3.6",
]
@@ -3131,7 +3309,7 @@ dependencies = [
"log",
"memmap",
"num_cpus",
- "parking_lot",
+ "parking_lot 0.7.1",
"rustc",
"rustc_apfloat",
"rustc_codegen_utils",
@@ -3174,7 +3352,7 @@ dependencies = [
"jobserver",
"lazy_static 1.3.0",
"log",
- "parking_lot",
+ "parking_lot 0.7.1",
"rustc-hash",
"rustc-rayon",
"rustc-rayon-core",
@@ -3314,9 +3492,9 @@ name = "rustc_macros"
version = "0.1.0"
dependencies = [
"itertools 0.8.0",
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
"synstructure",
]
@@ -3555,20 +3733,19 @@ dependencies = [
[[package]]
name = "rustfmt-config_proc_macro"
-version = "0.1.2"
+version = "0.2.0"
dependencies = [
- "proc-macro2",
- "quote",
+ "proc-macro2 1.0.3",
+ "quote 1.0.2",
"serde",
- "syn",
+ "syn 1.0.5",
]
[[package]]
name = "rustfmt-nightly"
-version = "1.4.6"
+version = "1.4.8"
dependencies = [
"annotate-snippets",
- "atty",
"bytecount",
"cargo_metadata",
"derive-new",
@@ -3589,7 +3766,7 @@ dependencies = [
"rustfmt-config_proc_macro",
"serde",
"serde_json",
- "structopt",
+ "structopt 0.3.1",
"term 0.6.0",
"toml",
"unicode-segmentation",
@@ -3698,18 +3875,9 @@ version = "1.0.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "477b13b646f5b5b56fc95bedfc3b550d12141ce84f466f6c44b9a17589923885"
dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_ignored"
-version = "0.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190e9765dcedb56be63b6e0993a006c7e3b071a016a304736e4a315dc01fb142"
-dependencies = [
- "serde",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
]
[[package]]
@@ -3732,6 +3900,17 @@ dependencies = [
"serde",
]
+[[package]]
+name = "serde_repr"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd02c7587ec314570041b2754829f84d873ced14a96d1fd1823531e11db40573"
+dependencies = [
+ "proc-macro2 1.0.3",
+ "quote 1.0.2",
+ "syn 1.0.5",
+]
+
[[package]]
name = "serde_urlencoded"
version = "0.5.5"
@@ -3889,8 +4068,8 @@ checksum = "1eea1eee654ef80933142157fdad9dd8bc43cf7c74e999e369263496f04ff4da"
dependencies = [
"phf_generator",
"phf_shared",
- "proc-macro2",
- "quote",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
"string_cache_shared",
]
@@ -3911,9 +4090,9 @@ dependencies = [
[[package]]
name = "strsim"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "structopt"
@@ -3922,7 +4101,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7"
dependencies = [
"clap",
- "structopt-derive",
+ "structopt-derive 0.2.18",
+]
+
+[[package]]
+name = "structopt"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ac9d6e93dd792b217bf89cda5c14566e3043960c6f9da890c2ba5d09d07804c"
+dependencies = [
+ "clap",
+ "structopt-derive 0.3.1",
]
[[package]]
@@ -3932,9 +4121,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107"
dependencies = [
"heck",
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
+]
+
+[[package]]
+name = "structopt-derive"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ae9e5165d463a0dea76967d021f8d0f9316057bf5163aa2a4843790e842ff37"
+dependencies = [
+ "heck",
+ "proc-macro-error",
+ "proc-macro2 1.0.3",
+ "quote 1.0.2",
+ "syn 1.0.5",
]
[[package]]
@@ -3950,9 +4152,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8baacebd7b7c9b864d83a6ba7a246232983e277b86fa5cdec77f565715a4b136"
dependencies = [
"heck",
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
]
[[package]]
@@ -3961,20 +4163,31 @@ version = "0.15.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "641e117d55514d6d918490e47102f7e08d096fdde360247e4a10f7a91a8478d3"
dependencies = [
- "proc-macro2",
- "quote",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
"unicode-xid 0.1.0",
]
+[[package]]
+name = "syn"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
+dependencies = [
+ "proc-macro2 1.0.3",
+ "quote 1.0.2",
+ "unicode-xid 0.2.0",
+]
+
[[package]]
name = "synstructure"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.12",
+ "syn 0.15.35",
"unicode-xid 0.1.0",
]
@@ -4154,9 +4367,9 @@ dependencies = [
[[package]]
name = "textwrap"
-version = "0.10.0"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
dependencies = [
"unicode-width",
]
@@ -4279,6 +4492,19 @@ dependencies = [
"log",
]
+[[package]]
+name = "tokio-named-pipes"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d282d483052288b2308ba5ee795f5673b159c9bdf63c385a05609da782a5eae"
+dependencies = [
+ "bytes",
+ "futures",
+ "mio",
+ "mio-named-pipes",
+ "tokio",
+]
+
[[package]]
name = "tokio-process"
version = "0.2.3"
@@ -4307,12 +4533,21 @@ dependencies = [
"log",
"mio",
"num_cpus",
- "parking_lot",
+ "parking_lot 0.7.1",
"slab",
"tokio-executor",
"tokio-io",
]
+[[package]]
+name = "tokio-service"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162"
+dependencies = [
+ "futures",
+]
+
[[package]]
name = "tokio-signal"
version = "0.2.7"
@@ -4436,8 +4671,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c99ca245ec273c7e75c8ee58f47b882d0146f3c2c8495158082c6671e8b5335"
dependencies = [
"darling",
- "quote",
- "syn",
+ "quote 0.6.12",
+ "syn 0.15.35",
]
[[package]]
@@ -4574,16 +4809,6 @@ dependencies = [
"serde",
]
-[[package]]
-name = "url_serde"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74e7d099f1ee52f823d4bdd60c93c3602043c728f5db3b97bdb548467f7bddea"
-dependencies = [
- "serde",
- "url 1.7.2",
-]
-
[[package]]
name = "utf-8"
version = "0.7.2"
From 69d503038edc7bd20b6262e60b1640ba88403c52 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 9 Sep 2019 20:32:03 +0200
Subject: [PATCH 5/6] Update LLVM submodule
---
src/llvm-project | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/llvm-project b/src/llvm-project
index 48818e9f5d0f2..71fe7ec06b85f 160000
--- a/src/llvm-project
+++ b/src/llvm-project
@@ -1 +1 @@
-Subproject commit 48818e9f5d0f2d5978a9b43ad1a2e8d0b83f6aa0
+Subproject commit 71fe7ec06b85f612fc0e4eb4134c7a7d0f23fac5
From 6c74bc951804940800da45ba5b9b3c3e5b613eb3 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 9 Sep 2019 13:01:05 -0700
Subject: [PATCH 6/6] Update version of `rustc-std-workspace-*` crates
This commit updates the version of the `rustc-std-workspace-*` crates
in-tree which are used in `[patch]`. This will guarantee that Cargo will
select these versions even if minor updates are published to crates.io
because otherwise a newer version on crates.io would be preferred which
misses the point of `[patch]`!
---
Cargo.lock | 6 +++---
src/tools/rustc-std-workspace-alloc/Cargo.toml | 2 +-
src/tools/rustc-std-workspace-core/Cargo.toml | 2 +-
src/tools/rustc-std-workspace-std/Cargo.toml | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 328d96023bc1f..9ffa250c5720f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3046,21 +3046,21 @@ checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
[[package]]
name = "rustc-std-workspace-alloc"
-version = "1.0.0"
+version = "1.99.0"
dependencies = [
"alloc",
]
[[package]]
name = "rustc-std-workspace-core"
-version = "1.0.0"
+version = "1.99.0"
dependencies = [
"core",
]
[[package]]
name = "rustc-std-workspace-std"
-version = "1.0.0"
+version = "1.99.0"
dependencies = [
"std",
]
diff --git a/src/tools/rustc-std-workspace-alloc/Cargo.toml b/src/tools/rustc-std-workspace-alloc/Cargo.toml
index ef7dc812af9d4..9e04b14756e06 100644
--- a/src/tools/rustc-std-workspace-alloc/Cargo.toml
+++ b/src/tools/rustc-std-workspace-alloc/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "rustc-std-workspace-alloc"
-version = "1.0.0"
+version = "1.99.0"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
license = 'MIT OR Apache-2.0'
description = """
diff --git a/src/tools/rustc-std-workspace-core/Cargo.toml b/src/tools/rustc-std-workspace-core/Cargo.toml
index 38ca56a557be6..6b4e7540affc9 100644
--- a/src/tools/rustc-std-workspace-core/Cargo.toml
+++ b/src/tools/rustc-std-workspace-core/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "rustc-std-workspace-core"
-version = "1.0.0"
+version = "1.99.0"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
license = 'MIT OR Apache-2.0'
description = """
diff --git a/src/tools/rustc-std-workspace-std/Cargo.toml b/src/tools/rustc-std-workspace-std/Cargo.toml
index ce1644809dbe6..e41554b74affd 100644
--- a/src/tools/rustc-std-workspace-std/Cargo.toml
+++ b/src/tools/rustc-std-workspace-std/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "rustc-std-workspace-std"
-version = "1.0.0"
+version = "1.99.0"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
license = 'MIT OR Apache-2.0'
description = """