summary refs log tree commit diff
path: root/src/librustc
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2018-08-29 08:21:01 -0500
committerCorey Farwell <coreyf@rwell.org>2018-08-29 09:01:35 -0500
commite477a13d63c2139f39c192c8e22dcfd0810f68e4 (patch)
treec5ed734f6ed887a5348070b7666db6ac13468e2c /src/librustc
parentca0de63898b525656ad8447cd81ccb08a05e3d6c (diff)
downloadrust-e477a13d63c2139f39c192c8e22dcfd0810f68e4.tar.gz
rust-e477a13d63c2139f39c192c8e22dcfd0810f68e4.zip
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/librustc')
-rw-r--r--src/librustc/ty/query/plumbing.rs4
-rw-r--r--src/librustc/util/common.rs2
-rw-r--r--src/librustc/util/profiling.rs2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc/ty/query/plumbing.rs b/src/librustc/ty/query/plumbing.rs
index 8473e4af40e..0edb1aa79e7 100644
--- a/src/librustc/ty/query/plumbing.rs
+++ b/src/librustc/ty/query/plumbing.rs
@@ -718,7 +718,7 @@ macro_rules! define_queries_inner {
             }
         }
 
-        #[allow(bad_style)]
+        #[allow(nonstandard_style)]
         #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
         pub enum Query<$tcx> {
             $($(#[$attr])* $name($K)),*
@@ -775,7 +775,7 @@ macro_rules! define_queries_inner {
         pub mod queries {
             use std::marker::PhantomData;
 
-            $(#[allow(bad_style)]
+            $(#[allow(nonstandard_style)]
             pub struct $name<$tcx> {
                 data: PhantomData<&$tcx ()>
             })*
diff --git a/src/librustc/util/common.rs b/src/librustc/util/common.rs
index bdfba7c3e3a..02bdc5f41b3 100644
--- a/src/librustc/util/common.rs
+++ b/src/librustc/util/common.rs
@@ -84,7 +84,7 @@ pub struct ProfQDumpParams {
     pub dump_profq_msg_log:bool,
 }
 
-#[allow(bad_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct QueryMsg {
     pub query: &'static str,
diff --git a/src/librustc/util/profiling.rs b/src/librustc/util/profiling.rs
index 74ff1a5f4fd..70760d35f78 100644
--- a/src/librustc/util/profiling.rs
+++ b/src/librustc/util/profiling.rs
@@ -21,7 +21,7 @@ macro_rules! define_categories {
             $($name),*
         }
 
-        #[allow(bad_style)]
+        #[allow(nonstandard_style)]
         struct Categories<T> {
             $($name: T),*
         }