diff --git a/Cargo.lock b/Cargo.lock index 50a5d78731feb..0a29c05822668 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3097,15 +3097,15 @@ dependencies = [ "anyhow", "cargo", "cargo-util", - "cargo_metadata 0.12.0", + "cargo_metadata 0.14.0", "clippy_lints", "crossbeam-channel", "difference", - "env_logger 0.7.1", + "env_logger 0.9.0", "futures 0.3.12", "heck", "home", - "itertools 0.9.0", + "itertools 0.10.1", "jsonrpc-core", "lazy_static", "log", @@ -3114,7 +3114,7 @@ dependencies = [ "num_cpus", "ordslice", "racer", - "rand 0.7.3", + "rand 0.8.4", "rayon", "regex", "rls-analysis", diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index d5f9d20c426e2..b002104897fe9 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -610,3 +610,7 @@ mod sealed { #[unstable(feature = "sealed", issue = "none")] pub trait Sealed {} } + +#[unstable(feature = "thread_local_const_init", issue = "91543")] +#[allow(unused)] +fn workaround_for_91543_as_racer_needs_this_feature_gate() {} diff --git a/src/ci/channel b/src/ci/channel index bf867e0ae5b6c..65b2df87f7df3 100644 --- a/src/ci/channel +++ b/src/ci/channel @@ -1 +1 @@ -nightly +beta diff --git a/src/tools/rls b/src/tools/rls index bf88026f11f2c..362fa390196cf 160000 --- a/src/tools/rls +++ b/src/tools/rls @@ -1 +1 @@ -Subproject commit bf88026f11f2cc7bb9fefdfe1dbcab642f110afa +Subproject commit 362fa390196cf9f9a3dac47be906b2ff144839a7 diff --git a/src/tools/rustfmt/src/ignore_path.rs b/src/tools/rustfmt/src/ignore_path.rs index 7738eee0a7604..c392130566f2a 100644 --- a/src/tools/rustfmt/src/ignore_path.rs +++ b/src/tools/rustfmt/src/ignore_path.rs @@ -32,16 +32,15 @@ impl IgnorePathSet { #[cfg(test)] mod test { - use std::path::{Path, PathBuf}; - - use crate::config::{Config, FileName}; - use crate::ignore_path::IgnorePathSet; - use rustfmt_config_proc_macro::nightly_only_test; #[nightly_only_test] #[test] fn test_ignore_path_set() { + use std::path::{Path, PathBuf}; + use crate::config::{Config, FileName}; + use crate::ignore_path::IgnorePathSet; + let config = Config::from_toml(r#"ignore = ["foo.rs", "bar_dir/*"]"#, Path::new("")).unwrap(); let ignore_path_set = IgnorePathSet::from_ignore_list(&config.ignore()).unwrap();