Skip to content

Commit 78d5509

Browse files
authored
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`: - #41646
2 parents 07fcb01 + e477a13 commit 78d5509

File tree

31 files changed

+52
-52
lines changed

31 files changed

+52
-52
lines changed

src/bootstrap/job.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
//! Note that this module has a #[cfg(windows)] above it as none of this logic
3838
//! is required on Unix.
3939
40-
#![allow(bad_style, dead_code)]
40+
#![allow(nonstandard_style, dead_code)]
4141

4242
use std::env;
4343
use std::io;

src/bootstrap/util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ pub fn symlink_dir(config: &Config, src: &Path, dest: &Path) -> io::Result<()> {
137137
//
138138
// Copied from std
139139
#[cfg(windows)]
140-
#[allow(bad_style)]
140+
#[allow(nonstandard_style)]
141141
fn symlink_dir_inner(target: &Path, junction: &Path) -> io::Result<()> {
142142
use std::ptr;
143143
use std::ffi::OsStr;

src/liballoc_system/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ mod platform {
220220
}
221221

222222
#[cfg(windows)]
223-
#[allow(bad_style)]
223+
#[allow(nonstandard_style)]
224224
mod platform {
225225
use MIN_ALIGN;
226226
use System;

src/libpanic_unwind/seh.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
//! [win64]: http://msdn.microsoft.com/en-us/library/1eyas8tf.aspx
5555
//! [llvm]: http://llvm.org/docs/ExceptionHandling.html#background-on-windows-exceptions
5656
57-
#![allow(bad_style)]
57+
#![allow(nonstandard_style)]
5858
#![allow(private_no_mangle_fns)]
5959

6060
use alloc::boxed::Box;

src/libpanic_unwind/seh64_gnu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//! Unwinding implementation of top of native Win64 SEH,
1212
//! however the unwind handler data (aka LSDA) uses GCC-compatible encoding.
1313
14-
#![allow(bad_style)]
14+
#![allow(nonstandard_style)]
1515
#![allow(private_no_mangle_fns)]
1616

1717
use alloc::boxed::Box;

src/libpanic_unwind/windows.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![allow(bad_style)]
11+
#![allow(nonstandard_style)]
1212
#![allow(dead_code)]
1313
#![cfg(windows)]
1414

src/librustc/ty/query/plumbing.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ macro_rules! define_queries_inner {
718718
}
719719
}
720720

721-
#[allow(bad_style)]
721+
#[allow(nonstandard_style)]
722722
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
723723
pub enum Query<$tcx> {
724724
$($(#[$attr])* $name($K)),*
@@ -775,7 +775,7 @@ macro_rules! define_queries_inner {
775775
pub mod queries {
776776
use std::marker::PhantomData;
777777

778-
$(#[allow(bad_style)]
778+
$(#[allow(nonstandard_style)]
779779
pub struct $name<$tcx> {
780780
data: PhantomData<&$tcx ()>
781781
})*

src/librustc/util/common.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ pub struct ProfQDumpParams {
8484
pub dump_profq_msg_log:bool,
8585
}
8686

87-
#[allow(bad_style)]
87+
#[allow(nonstandard_style)]
8888
#[derive(Clone, Debug, PartialEq, Eq)]
8989
pub struct QueryMsg {
9090
pub query: &'static str,

src/librustc/util/profiling.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ macro_rules! define_categories {
2121
$($name),*
2222
}
2323

24-
#[allow(bad_style)]
24+
#[allow(nonstandard_style)]
2525
struct Categories<T> {
2626
$($name: T),*
2727
}

src/librustc_data_structures/flock.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ mod imp {
239239
}
240240

241241
#[cfg(windows)]
242-
#[allow(bad_style)]
242+
#[allow(nonstandard_style)]
243243
mod imp {
244244
use std::io;
245245
use std::mem;

0 commit comments

Comments
 (0)