Auto merge of #44966 - zackmdavis:no_mangle_no_snake, r=aturon

bors · bors · commit 67ed4891db42 · 2017-10-03T02:26:27.000Z
make non_snake_case lint allow extern no-mangle functions Resolves #31924. r? @sfackler
diff --git a/src/librustc_lint/bad_style.rs b/src/librustc_lint/bad_style.rs
@@ -13,6 +13,7 @@ use rustc::ty;
 use lint::{LateContext, LintContext, LintArray};
 use lint::{LintPass, LateLintPass};
 
+use syntax::abi::Abi;
 use syntax::ast;
 use syntax::attr;
 use syntax_pos::Span;
@@ -250,7 +251,11 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NonSnakeCase {
                     _ => (),
                 }
             }
-            FnKind::ItemFn(name, ..) => {
+            FnKind::ItemFn(name, _, _, _, abi, _, attrs) => {
+                // Skip foreign-ABI #[no_mangle] functions (Issue #31924)
+                if abi != Abi::Rust && attr::find_by_name(attrs, "no_mangle").is_some() {
+                    return;
+                }
                 self.check_snake_case(cx, "function", &name.as_str(), Some(span))
             }
             FnKind::Closure(_) => (),
diff --git a/src/test/compile-fail/issue-31924-non-snake-ffi.rs b/src/test/compile-fail/issue-31924-non-snake-ffi.rs
@@ -0,0 +1,18 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![feature(rustc_attrs)]
+#![deny(non_snake_case)]
+
+#[no_mangle]
+pub extern "C" fn SparklingGenerationForeignFunctionInterface() {}
+
+#[rustc_error]
+fn main() {} //~ ERROR compilation successful

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ use rustc::ty;`
`13`	`13`	`use lint::{LateContext, LintContext, LintArray};`
`14`	`14`	`use lint::{LintPass, LateLintPass};`
`15`	`15`
	`16`	`+use syntax::abi::Abi;`
`16`	`17`	`use syntax::ast;`
`17`	`18`	`use syntax::attr;`
`18`	`19`	`use syntax_pos::Span;`
`@@ -250,7 +251,11 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NonSnakeCase {`
`250`	`251`	`_ => (),`
`251`	`252`	`}`
`252`	`253`	`}`
`253`		`- FnKind::ItemFn(name, ..) => {`
	`254`	`+ FnKind::ItemFn(name, _, _, _, abi, _, attrs) => {`
	`255`	`+ // Skip foreign-ABI #[no_mangle] functions (Issue #31924)`
	`256`	`+ if abi != Abi::Rust && attr::find_by_name(attrs, "no_mangle").is_some() {`
	`257`	`+ return;`
	`258`	`+ }`
`254`	`259`	`self.check_snake_case(cx, "function", &name.as_str(), Some(span))`
`255`	`260`	`}`
`256`	`261`	`FnKind::Closure(_) => (),`