提交 a076fef2 编写于 作者: F Felix S. Klock II

Add new lint: non_uppercase_pattern_statics, for #7526.

This tries to warn about code like:
    ```rust
    match (0,0) {
        (0, aha) => { ... },
        ...
    }
    ```
where `aha` is actually a static constant, not a binding.
上级 8174618a
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
// LLVM wrappers are intended to be called from trans, // LLVM wrappers are intended to be called from trans,
// which already runs in a #[fixed_stack_segment] // which already runs in a #[fixed_stack_segment]
#[allow(cstack)]; #[allow(cstack)];
#[allow(non_uppercase_pattern_statics)];
use std::c_str::ToCStr; use std::c_str::ToCStr;
use std::hashmap::HashMap; use std::hashmap::HashMap;
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
use middle::const_eval::{compare_const_vals, lookup_const_by_id}; use middle::const_eval::{compare_const_vals, lookup_const_by_id};
use middle::const_eval::{eval_const_expr, const_val, const_bool, const_float}; use middle::const_eval::{eval_const_expr, const_val, const_bool, const_float};
use middle::lint::non_uppercase_pattern_statics;
use middle::pat_util::*; use middle::pat_util::*;
use middle::ty::*; use middle::ty::*;
use middle::ty; use middle::ty;
...@@ -133,11 +134,30 @@ pub fn check_arms(cx: &MatchCheckCtxt, arms: &[Arm]) { ...@@ -133,11 +134,30 @@ pub fn check_arms(cx: &MatchCheckCtxt, arms: &[Arm]) {
_ => false _ => false
} }
}; };
// Lint for constants that look like binding identifiers (#7526)
let pat_matches_non_uppercase_static: &fn(@Pat) = |p| {
let msg = "static constant in pattern should have an uppercase identifier";
match (&p.node, cx.tcx.def_map.find(&p.id)) {
(&PatIdent(_, ref path, _), Some(&DefStatic(_, false))) => {
// last identifier alone is right choice for this lint.
let ident = path.segments.last().identifier;
let s = cx.tcx.sess.str_of(ident);
if s.iter().any(|c| c.is_lowercase()) {
cx.tcx.sess.add_lint(non_uppercase_pattern_statics,
p.id, path.span, msg.to_owned());
}
}
_ => {}
}
};
do walk_pat(*pat) |p| { do walk_pat(*pat) |p| {
if pat_matches_nan(p) { if pat_matches_nan(p) {
cx.tcx.sess.span_warn(p.span, "unmatchable NaN in pattern, \ cx.tcx.sess.span_warn(p.span, "unmatchable NaN in pattern, \
use the is_nan method in a guard instead"); use the is_nan method in a guard instead");
} }
pat_matches_non_uppercase_static(p);
true true
}; };
......
...@@ -83,6 +83,7 @@ pub enum lint { ...@@ -83,6 +83,7 @@ pub enum lint {
unrecognized_lint, unrecognized_lint,
non_camel_case_types, non_camel_case_types,
non_uppercase_statics, non_uppercase_statics,
non_uppercase_pattern_statics,
type_limits, type_limits,
unused_unsafe, unused_unsafe,
...@@ -209,6 +210,13 @@ enum LintSource { ...@@ -209,6 +210,13 @@ enum LintSource {
default: allow default: allow
}), }),
("non_uppercase_pattern_statics",
LintSpec {
lint: non_uppercase_pattern_statics,
desc: "static constants in match patterns should be uppercased",
default: warn
}),
("managed_heap_memory", ("managed_heap_memory",
LintSpec { LintSpec {
lint: managed_heap_memory, lint: managed_heap_memory,
......
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
// 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(non_uppercase_pattern_statics)];
use lib::llvm::{llvm, Integer, Pointer, Float, Double, Struct, Array}; use lib::llvm::{llvm, Integer, Pointer, Float, Double, Struct, Array};
use lib::llvm::{Attribute, StructRetAttribute}; use lib::llvm::{Attribute, StructRetAttribute};
use middle::trans::cabi::{FnType, LLVMType}; use middle::trans::cabi::{FnType, LLVMType};
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +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(non_uppercase_pattern_statics)];
use std::libc::c_uint; use std::libc::c_uint;
use std::num; use std::num;
......
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
// The classification code for the x86_64 ABI is taken from the clay language // The classification code for the x86_64 ABI is taken from the clay language
// https://github.com/jckarter/clay/blob/master/compiler/src/externals.cpp // https://github.com/jckarter/clay/blob/master/compiler/src/externals.cpp
#[allow(non_uppercase_pattern_statics)];
use lib::llvm::{llvm, Integer, Pointer, Float, Double}; use lib::llvm::{llvm, Integer, Pointer, Float, Double};
use lib::llvm::{Struct, Array, Attribute}; use lib::llvm::{Struct, Array, Attribute};
use lib::llvm::{StructRetAttribute, ByValAttribute}; use lib::llvm::{StructRetAttribute, ByValAttribute};
......
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
// 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(non_uppercase_pattern_statics)];
use back::{abi}; use back::{abi};
use lib::llvm::{SequentiallyConsistent, Acquire, Release, Xchg}; use lib::llvm::{SequentiallyConsistent, Acquire, Release, Xchg};
use lib::llvm::{ValueRef, Pointer}; use lib::llvm::{ValueRef, Pointer};
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +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(non_uppercase_pattern_statics)];
use lib::llvm::{llvm, TypeRef, Bool, False, True, TypeKind}; use lib::llvm::{llvm, TypeRef, Bool, False, True, TypeKind};
use lib::llvm::{Float, Double, X86_FP80, PPC_FP128, FP128}; use lib::llvm::{Float, Double, X86_FP80, PPC_FP128, FP128};
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
//! Operations and constants for `f32` //! Operations and constants for `f32`
#[allow(missing_doc)]; #[allow(missing_doc)];
#[allow(non_uppercase_statics)]; #[allow(non_uppercase_statics)];
#[allow(non_uppercase_pattern_statics)];
use default::Default; use default::Default;
use libc::c_int; use libc::c_int;
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#[allow(missing_doc)]; #[allow(missing_doc)];
#[allow(non_uppercase_statics)]; #[allow(non_uppercase_statics)];
#[allow(non_uppercase_pattern_statics)];
use default::Default; use default::Default;
use libc::c_int; use libc::c_int;
......
// Copyright 2012-2013 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.
// Issue #7526: lowercase static constants in patterns look like bindings
#[deny(non_uppercase_pattern_statics)];
pub static a : int = 97;
fn f() {
let r = match (0,0) {
(0, a) => 0,
//~^ ERROR static constant in pattern should have an uppercase id
(x, y) => 1 + x + y,
};
assert!(r == 1);
}
mod m {
pub static aha : int = 7;
}
fn g() {
use m::aha;
let r = match (0,0) {
(0, aha) => 0,
//~^ ERROR static constant in pattern should have an uppercase id
(x, y) => 1 + x + y,
};
assert!(r == 1);
}
fn main () {
f();
g();
}
// Copyright 2012-2013 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.
// Issue #7526: lowercase static constants in patterns look like bindings
// This is similar to compile-fail/match-static-const-lc, except it
// shows the expected usual workaround (choosing a different name for
// the static definition) and also demonstrates that one can work
// around this problem locally by reanming the constant in the `use`
// form to an uppercase identifier that placates the lint.
#[deny(non_uppercase_pattern_statics)];
pub static A : int = 97;
fn f() {
let r = match (0,0) {
(0, A) => 0,
(x, y) => 1 + x + y,
};
assert!(r == 1);
}
mod m {
pub static aha : int = 7;
}
fn g() {
use AHA = m::aha;
let r = match (0,0) {
(0, AHA) => 0,
(x, y) => 1 + x + y,
};
assert!(r == 1);
}
fn main () {
f();
g();
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册