Skip to content

Commit 7c0b250

Browse files
committed
Auto merge of rust-lang#92734 - pietroalbini:beta-1.59.0, r=pietroalbini
[beta] Prepare 1.59.0 beta cc `@rust-lang/release` r? `@ghost`
2 parents 0282233 + 7df20db commit 7c0b250

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
lines changed

Cargo.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -3097,15 +3097,15 @@ dependencies = [
30973097
"anyhow",
30983098
"cargo",
30993099
"cargo-util",
3100-
"cargo_metadata 0.12.0",
3100+
"cargo_metadata 0.14.0",
31013101
"clippy_lints",
31023102
"crossbeam-channel",
31033103
"difference",
3104-
"env_logger 0.7.1",
3104+
"env_logger 0.9.0",
31053105
"futures 0.3.12",
31063106
"heck",
31073107
"home",
3108-
"itertools 0.9.0",
3108+
"itertools 0.10.1",
31093109
"jsonrpc-core",
31103110
"lazy_static",
31113111
"log",
@@ -3114,7 +3114,7 @@ dependencies = [
31143114
"num_cpus",
31153115
"ordslice",
31163116
"racer",
3117-
"rand 0.7.3",
3117+
"rand 0.8.4",
31183118
"rayon",
31193119
"regex",
31203120
"rls-analysis",

library/std/src/lib.rs

+4
Original file line numberDiff line numberDiff line change
@@ -610,3 +610,7 @@ mod sealed {
610610
#[unstable(feature = "sealed", issue = "none")]
611611
pub trait Sealed {}
612612
}
613+
614+
#[unstable(feature = "thread_local_const_init", issue = "91543")]
615+
#[allow(unused)]
616+
fn workaround_for_91543_as_racer_needs_this_feature_gate() {}

src/ci/channel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly
1+
beta

src/tools/rustfmt/src/ignore_path.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,15 @@ impl IgnorePathSet {
3232

3333
#[cfg(test)]
3434
mod test {
35-
use std::path::{Path, PathBuf};
36-
37-
use crate::config::{Config, FileName};
38-
use crate::ignore_path::IgnorePathSet;
39-
4035
use rustfmt_config_proc_macro::nightly_only_test;
4136

4237
#[nightly_only_test]
4338
#[test]
4439
fn test_ignore_path_set() {
40+
use std::path::{Path, PathBuf};
41+
use crate::config::{Config, FileName};
42+
use crate::ignore_path::IgnorePathSet;
43+
4544
let config =
4645
Config::from_toml(r#"ignore = ["foo.rs", "bar_dir/*"]"#, Path::new("")).unwrap();
4746
let ignore_path_set = IgnorePathSet::from_ignore_list(&config.ignore()).unwrap();

0 commit comments

Comments
 (0)