about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorPietro Albini <pietro@pietroalbini.org>2018-08-30 20:15:47 +0200
committerGitHub <noreply@github.com>2018-08-30 20:15:47 +0200
commit78d5509625bf3f96e5d89b74eae14584deb9915d (patch)
treea7d9916dcacf36e1e5196d33ae3a71a1f4c9c917 /src/bootstrap
parent07fcb0168e208a2448ba82d65a626c5d0f265638 (diff)
parente477a13d63c2139f39c192c8e22dcfd0810f68e4 (diff)
downloadrust-78d5509625bf3f96e5d89b74eae14584deb9915d.tar.gz
rust-78d5509625bf3f96e5d89b74eae14584deb9915d.zip
Rollup merge of #53786 - frewsxcv:frewsxcv-bad-style, r=Manishearth
Replace usages of 'bad_style' with 'nonstandard_style'.

`bad_style` is being deprecated in favor of `nonstandard_style`:

- https://github.com/rust-lang/rust/issues/41646
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/job.rs2
-rw-r--r--src/bootstrap/util.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/job.rs b/src/bootstrap/job.rs
index 6445ce8da33..e6ee525ca2e 100644
--- a/src/bootstrap/job.rs
+++ b/src/bootstrap/job.rs
@@ -37,7 +37,7 @@
 //! Note that this module has a #[cfg(windows)] above it as none of this logic
 //! is required on Unix.
 
-#![allow(bad_style, dead_code)]
+#![allow(nonstandard_style, dead_code)]
 
 use std::env;
 use std::io;
diff --git a/src/bootstrap/util.rs b/src/bootstrap/util.rs
index be03796921a..8ce8f20add3 100644
--- a/src/bootstrap/util.rs
+++ b/src/bootstrap/util.rs
@@ -137,7 +137,7 @@ pub fn symlink_dir(config: &Config, src: &Path, dest: &Path) -> io::Result<()> {
     //
     // Copied from std
     #[cfg(windows)]
-    #[allow(bad_style)]
+    #[allow(nonstandard_style)]
     fn symlink_dir_inner(target: &Path, junction: &Path) -> io::Result<()> {
         use std::ptr;
         use std::ffi::OsStr;