1
Fork 0

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
This commit is contained in:
Pietro Albini 2018-08-30 20:15:47 +02:00 committed by GitHub
commit 78d5509625
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 52 additions and 52 deletions

View file

@ -37,7 +37,7 @@
//! Note that this module has a #[cfg(windows)] above it as none of this logic //! Note that this module has a #[cfg(windows)] above it as none of this logic
//! is required on Unix. //! is required on Unix.
#![allow(bad_style, dead_code)] #![allow(nonstandard_style, dead_code)]
use std::env; use std::env;
use std::io; use std::io;

View file

@ -137,7 +137,7 @@ pub fn symlink_dir(config: &Config, src: &Path, dest: &Path) -> io::Result<()> {
// //
// Copied from std // Copied from std
#[cfg(windows)] #[cfg(windows)]
#[allow(bad_style)] #[allow(nonstandard_style)]
fn symlink_dir_inner(target: &Path, junction: &Path) -> io::Result<()> { fn symlink_dir_inner(target: &Path, junction: &Path) -> io::Result<()> {
use std::ptr; use std::ptr;
use std::ffi::OsStr; use std::ffi::OsStr;

View file

@ -220,7 +220,7 @@ mod platform {
} }
#[cfg(windows)] #[cfg(windows)]
#[allow(bad_style)] #[allow(nonstandard_style)]
mod platform { mod platform {
use MIN_ALIGN; use MIN_ALIGN;
use System; use System;

View file

@ -54,7 +54,7 @@
//! [win64]: http://msdn.microsoft.com/en-us/library/1eyas8tf.aspx //! [win64]: http://msdn.microsoft.com/en-us/library/1eyas8tf.aspx
//! [llvm]: http://llvm.org/docs/ExceptionHandling.html#background-on-windows-exceptions //! [llvm]: http://llvm.org/docs/ExceptionHandling.html#background-on-windows-exceptions
#![allow(bad_style)] #![allow(nonstandard_style)]
#![allow(private_no_mangle_fns)] #![allow(private_no_mangle_fns)]
use alloc::boxed::Box; use alloc::boxed::Box;

View file

@ -11,7 +11,7 @@
//! Unwinding implementation of top of native Win64 SEH, //! Unwinding implementation of top of native Win64 SEH,
//! however the unwind handler data (aka LSDA) uses GCC-compatible encoding. //! however the unwind handler data (aka LSDA) uses GCC-compatible encoding.
#![allow(bad_style)] #![allow(nonstandard_style)]
#![allow(private_no_mangle_fns)] #![allow(private_no_mangle_fns)]
use alloc::boxed::Box; use alloc::boxed::Box;

View file

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
#![allow(bad_style)] #![allow(nonstandard_style)]
#![allow(dead_code)] #![allow(dead_code)]
#![cfg(windows)] #![cfg(windows)]

View file

@ -718,7 +718,7 @@ macro_rules! define_queries_inner {
} }
} }
#[allow(bad_style)] #[allow(nonstandard_style)]
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)] #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
pub enum Query<$tcx> { pub enum Query<$tcx> {
$($(#[$attr])* $name($K)),* $($(#[$attr])* $name($K)),*
@ -775,7 +775,7 @@ macro_rules! define_queries_inner {
pub mod queries { pub mod queries {
use std::marker::PhantomData; use std::marker::PhantomData;
$(#[allow(bad_style)] $(#[allow(nonstandard_style)]
pub struct $name<$tcx> { pub struct $name<$tcx> {
data: PhantomData<&$tcx ()> data: PhantomData<&$tcx ()>
})* })*

View file

@ -84,7 +84,7 @@ pub struct ProfQDumpParams {
pub dump_profq_msg_log:bool, pub dump_profq_msg_log:bool,
} }
#[allow(bad_style)] #[allow(nonstandard_style)]
#[derive(Clone, Debug, PartialEq, Eq)] #[derive(Clone, Debug, PartialEq, Eq)]
pub struct QueryMsg { pub struct QueryMsg {
pub query: &'static str, pub query: &'static str,

View file

@ -21,7 +21,7 @@ macro_rules! define_categories {
$($name),* $($name),*
} }
#[allow(bad_style)] #[allow(nonstandard_style)]
struct Categories<T> { struct Categories<T> {
$($name: T),* $($name: T),*
} }

View file

@ -239,7 +239,7 @@ mod imp {
} }
#[cfg(windows)] #[cfg(windows)]
#[allow(bad_style)] #[allow(nonstandard_style)]
mod imp { mod imp {
use std::io; use std::io;
use std::mem; use std::mem;

View file

@ -22,7 +22,7 @@
use std::any::Any; use std::any::Any;
#[cfg(windows)] #[cfg(windows)]
#[allow(bad_style)] #[allow(nonstandard_style)]
pub fn acquire_global_lock(name: &str) -> Box<dyn Any> { pub fn acquire_global_lock(name: &str) -> Box<dyn Any> {
use std::ffi::CString; use std::ffi::CString;
use std::io; use std::io;

View file

@ -54,7 +54,7 @@ use syntax::errors::{Applicability, DiagnosticBuilder};
use rustc::hir::{self, GenericParamKind, PatKind}; use rustc::hir::{self, GenericParamKind, PatKind};
use rustc::hir::intravisit::FnKind; use rustc::hir::intravisit::FnKind;
use bad_style::{MethodLateContext, method_context}; use nonstandard_style::{MethodLateContext, method_context};
// hardwired lints from librustc // hardwired lints from librustc
pub use lint::builtin::*; pub use lint::builtin::*;

View file

@ -62,12 +62,12 @@ use syntax::edition::Edition;
use lint::LintId; use lint::LintId;
use lint::FutureIncompatibleInfo; use lint::FutureIncompatibleInfo;
mod bad_style; mod nonstandard_style;
pub mod builtin; pub mod builtin;
mod types; mod types;
mod unused; mod unused;
use bad_style::*; use nonstandard_style::*;
use builtin::*; use builtin::*;
use types::*; use types::*;
use unused::*; use unused::*;

View file

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
#![allow(bad_style)] #![allow(nonstandard_style)]
#![cfg_attr(not(stage0), feature(nll))] #![cfg_attr(not(stage0), feature(nll))]
#![cfg_attr(not(stage0), feature(infer_outlives_requirements))] #![cfg_attr(not(stage0), feature(infer_outlives_requirements))]

View file

@ -11,7 +11,7 @@
//! OS-specific functionality. //! OS-specific functionality.
#![stable(feature = "os", since = "1.0.0")] #![stable(feature = "os", since = "1.0.0")]
#![allow(missing_docs, bad_style, missing_debug_implementations)] #![allow(missing_docs, nonstandard_style, missing_debug_implementations)]
cfg_if! { cfg_if! {
if #[cfg(dox)] { if #[cfg(dox)] {

View file

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
#![allow(dead_code, missing_docs, bad_style)] #![allow(dead_code, missing_docs, nonstandard_style)]
use io::{self, ErrorKind}; use io::{self, ErrorKind};

View file

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
#![allow(missing_docs, bad_style)] #![allow(missing_docs, nonstandard_style)]
use io::{self, ErrorKind}; use io::{self, ErrorKind};
use libc; use libc;

View file

@ -297,7 +297,7 @@ pub fn lookup_host(_: &str) -> io::Result<LookupHost> {
unsupported() unsupported()
} }
#[allow(bad_style)] #[allow(nonstandard_style)]
pub mod netc { pub mod netc {
pub const AF_INET: u8 = 0; pub const AF_INET: u8 = 0;
pub const AF_INET6: u8 = 1; pub const AF_INET6: u8 = 1;

View file

@ -10,7 +10,7 @@
//! C definitions used by libnative that don't belong in liblibc //! C definitions used by libnative that don't belong in liblibc
#![allow(bad_style)] #![allow(nonstandard_style)]
#![cfg_attr(test, allow(dead_code))] #![cfg_attr(test, allow(dead_code))]
#![unstable(issue = "0", feature = "windows_c")] #![unstable(issue = "0", feature = "windows_c")]

View file

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
#![allow(missing_docs, bad_style)] #![allow(missing_docs, nonstandard_style)]
use ptr; use ptr;
use ffi::{OsStr, OsString}; use ffi::{OsStr, OsString};

View file

@ -10,7 +10,7 @@
//! Implementation of `std::os` functionality for Windows //! Implementation of `std::os` functionality for Windows
#![allow(bad_style)] #![allow(nonstandard_style)]
use os::windows::prelude::*; use os::windows::prelude::*;

View file

@ -1184,7 +1184,7 @@ fn get_concurrency() -> usize {
}; };
#[cfg(windows)] #[cfg(windows)]
#[allow(bad_style)] #[allow(nonstandard_style)]
fn num_cpus() -> usize { fn num_cpus() -> usize {
#[repr(C)] #[repr(C)]
struct SYSTEM_INFO { struct SYSTEM_INFO {

View file

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
#![allow(bad_style)] #![allow(nonstandard_style)]
macro_rules! cfg_if { macro_rules! cfg_if {
( $( if #[cfg( $meta:meta )] { $($it1:item)* } else { $($it2:item)* } )* ) => ( $( if #[cfg( $meta:meta )] { $($it1:item)* } else { $($it2:item)* } )* ) =>

View file

@ -52,7 +52,7 @@ fn is_sigill(status: ExitStatus) -> bool {
} }
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))] #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
#[allow(bad_style)] #[allow(nonstandard_style)]
mod test { mod test {
// An SSE type // An SSE type
#[repr(simd)] #[repr(simd)]

View file

@ -75,7 +75,7 @@ pub static THIS_STATIC: usize = 5usize;
pub trait SoAmbiguous {} pub trait SoAmbiguous {}
#[allow(bad_style)] #[allow(nonstandard_style)]
pub fn SoAmbiguous() {} pub fn SoAmbiguous() {}

View file

@ -8,16 +8,16 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
#![deny(bad_style)] #![deny(nonstandard_style)]
#![allow(dead_code)] #![allow(dead_code)]
fn CamelCase() {} //~ ERROR should have a snake fn CamelCase() {} //~ ERROR should have a snake
#[allow(bad_style)] #[allow(nonstandard_style)]
mod test { mod test {
fn CamelCase() {} fn CamelCase() {}
#[forbid(bad_style)] #[forbid(nonstandard_style)]
mod bad { mod bad {
fn CamelCase() {} //~ ERROR should have a snake fn CamelCase() {} //~ ERROR should have a snake
@ -25,7 +25,7 @@ mod test {
} }
mod warn { mod warn {
#![warn(bad_style)] #![warn(nonstandard_style)]
fn CamelCase() {} //~ WARN should have a snake fn CamelCase() {} //~ WARN should have a snake

View file

@ -7,9 +7,9 @@ LL | fn CamelCase() {} //~ ERROR should have a snake
note: lint level defined here note: lint level defined here
--> $DIR/lint-group-style.rs:11:9 --> $DIR/lint-group-style.rs:11:9
| |
LL | #![deny(bad_style)] LL | #![deny(nonstandard_style)]
| ^^^^^^^^^ | ^^^^^^^^^^^^^^^^^
= note: #[deny(non_snake_case)] implied by #[deny(bad_style)] = note: #[deny(non_snake_case)] implied by #[deny(nonstandard_style)]
error: function `CamelCase` should have a snake case name such as `camel_case` error: function `CamelCase` should have a snake case name such as `camel_case`
--> $DIR/lint-group-style.rs:22:9 --> $DIR/lint-group-style.rs:22:9
@ -20,9 +20,9 @@ LL | fn CamelCase() {} //~ ERROR should have a snake
note: lint level defined here note: lint level defined here
--> $DIR/lint-group-style.rs:20:14 --> $DIR/lint-group-style.rs:20:14
| |
LL | #[forbid(bad_style)] LL | #[forbid(nonstandard_style)]
| ^^^^^^^^^ | ^^^^^^^^^^^^^^^^^
= note: #[forbid(non_snake_case)] implied by #[forbid(bad_style)] = note: #[forbid(non_snake_case)] implied by #[forbid(nonstandard_style)]
error: static variable `bad` should have an upper case name such as `BAD` error: static variable `bad` should have an upper case name such as `BAD`
--> $DIR/lint-group-style.rs:24:9 --> $DIR/lint-group-style.rs:24:9
@ -33,9 +33,9 @@ LL | static bad: isize = 1; //~ ERROR should have an upper
note: lint level defined here note: lint level defined here
--> $DIR/lint-group-style.rs:20:14 --> $DIR/lint-group-style.rs:20:14
| |
LL | #[forbid(bad_style)] LL | #[forbid(nonstandard_style)]
| ^^^^^^^^^ | ^^^^^^^^^^^^^^^^^
= note: #[forbid(non_upper_case_globals)] implied by #[forbid(bad_style)] = note: #[forbid(non_upper_case_globals)] implied by #[forbid(nonstandard_style)]
warning: function `CamelCase` should have a snake case name such as `camel_case` warning: function `CamelCase` should have a snake case name such as `camel_case`
--> $DIR/lint-group-style.rs:30:9 --> $DIR/lint-group-style.rs:30:9
@ -46,9 +46,9 @@ LL | fn CamelCase() {} //~ WARN should have a snake
note: lint level defined here note: lint level defined here
--> $DIR/lint-group-style.rs:28:17 --> $DIR/lint-group-style.rs:28:17
| |
LL | #![warn(bad_style)] LL | #![warn(nonstandard_style)]
| ^^^^^^^^^ | ^^^^^^^^^^^^^^^^^
= note: #[warn(non_snake_case)] implied by #[warn(bad_style)] = note: #[warn(non_snake_case)] implied by #[warn(nonstandard_style)]
warning: type `snake_case` should have a camel case name such as `SnakeCase` warning: type `snake_case` should have a camel case name such as `SnakeCase`
--> $DIR/lint-group-style.rs:32:9 --> $DIR/lint-group-style.rs:32:9
@ -59,9 +59,9 @@ LL | struct snake_case; //~ WARN should have a camel
note: lint level defined here note: lint level defined here
--> $DIR/lint-group-style.rs:28:17 --> $DIR/lint-group-style.rs:28:17
| |
LL | #![warn(bad_style)] LL | #![warn(nonstandard_style)]
| ^^^^^^^^^ | ^^^^^^^^^^^^^^^^^
= note: #[warn(non_camel_case_types)] implied by #[warn(bad_style)] = note: #[warn(non_camel_case_types)] implied by #[warn(nonstandard_style)]
error: aborting due to 3 previous errors error: aborting due to 3 previous errors

View file

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
#![allow(bad_style, unused_variables)] #![allow(nonstandard_style, unused_variables)]
#![deny(non_shorthand_field_patterns)] #![deny(non_shorthand_field_patterns)]
struct Foo { struct Foo {

View file

@ -11,7 +11,7 @@
// Forbidding a group (here, `unused`) overrules subsequent allowance of both // Forbidding a group (here, `unused`) overrules subsequent allowance of both
// the group, and an individual lint in the group (here, `unused_variables`); // the group, and an individual lint in the group (here, `unused_variables`);
// and, forbidding an individual lint (here, `non_snake_case`) overrules // and, forbidding an individual lint (here, `non_snake_case`) overrules
// subsequent allowance of a lint group containing it (here, `bad_style`). See // subsequent allowance of a lint group containing it (here, `nonstandard_style`). See
// Issue #42873. // Issue #42873.
#![forbid(unused, non_snake_case)] #![forbid(unused, non_snake_case)]
@ -22,7 +22,7 @@ fn foo() {}
#[allow(unused)] //~ ERROR overruled #[allow(unused)] //~ ERROR overruled
fn bar() {} fn bar() {}
#[allow(bad_style)] //~ ERROR overruled #[allow(nonstandard_style)] //~ ERROR overruled
fn main() { fn main() {
println!("hello forbidden world") println!("hello forbidden world")
} }

View file

@ -16,14 +16,14 @@ LL | #![forbid(unused, non_snake_case)]
LL | #[allow(unused)] //~ ERROR overruled LL | #[allow(unused)] //~ ERROR overruled
| ^^^^^^ overruled by previous forbid | ^^^^^^ overruled by previous forbid
error[E0453]: allow(bad_style) overruled by outer forbid(non_snake_case) error[E0453]: allow(nonstandard_style) overruled by outer forbid(non_snake_case)
--> $DIR/outer-forbid.rs:25:9 --> $DIR/outer-forbid.rs:25:9
| |
LL | #![forbid(unused, non_snake_case)] LL | #![forbid(unused, non_snake_case)]
| -------------- `forbid` level set here | -------------- `forbid` level set here
... ...
LL | #[allow(bad_style)] //~ ERROR overruled LL | #[allow(nonstandard_style)] //~ ERROR overruled
| ^^^^^^^^^ overruled by previous forbid | ^^^^^^^^^^^^^^^^^ overruled by previous forbid
error: aborting due to 3 previous errors error: aborting due to 3 previous errors