mirror of
https://github.com/rust-lang/rust.git
synced 2025-02-21 19:33:16 +00:00
Fix #2196
This commit is contained in:
parent
e62727ee51
commit
317e97bae7
@ -1,9 +1,7 @@
|
||||
use rustc::hir::intravisit::FnKind;
|
||||
use rustc::hir::def_id::DefId;
|
||||
use rustc::hir;
|
||||
use rustc::lint::*;
|
||||
use rustc::ty::{self, Ty};
|
||||
use syntax::ast;
|
||||
use syntax::codemap::Span;
|
||||
use utils::paths;
|
||||
use utils::{get_trait_def_id, implements_trait, in_external_macro, return_ty, same_tys, span_lint_and_then};
|
||||
@ -90,26 +88,24 @@ impl LintPass for NewWithoutDefault {
|
||||
}
|
||||
|
||||
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NewWithoutDefault {
|
||||
fn check_fn(
|
||||
&mut self,
|
||||
cx: &LateContext<'a, 'tcx>,
|
||||
kind: FnKind<'tcx>,
|
||||
decl: &'tcx hir::FnDecl,
|
||||
_: &'tcx hir::Body,
|
||||
span: Span,
|
||||
id: ast::NodeId,
|
||||
) {
|
||||
if in_external_macro(cx, span) {
|
||||
fn check_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx hir::Item) {
|
||||
if let hir::ItemImpl(_, _, _, _, None, _, ref items) = item.node {
|
||||
for assoc_item in items {
|
||||
if let hir::AssociatedItemKind::Method { has_self: false } = assoc_item.kind {
|
||||
let impl_item = cx.tcx.hir.impl_item(assoc_item.id);
|
||||
if in_external_macro(cx, impl_item.span) {
|
||||
return;
|
||||
}
|
||||
|
||||
if let FnKind::Method(name, sig, _, _) = kind {
|
||||
if let hir::ImplItemKind::Method(ref sig, _) = impl_item.node {
|
||||
let name = impl_item.name;
|
||||
let span = impl_item.span;
|
||||
let id = impl_item.id;
|
||||
let decl = &sig.decl;
|
||||
if sig.constness == hir::Constness::Const {
|
||||
// can't be implemented by default
|
||||
return;
|
||||
}
|
||||
if !cx.generics
|
||||
.expect("method must have generics")
|
||||
if !impl_item.generics
|
||||
.ty_params
|
||||
.is_empty()
|
||||
{
|
||||
@ -156,6 +152,9 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NewWithoutDefault {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn create_new_without_default_suggest_msg(ty: Ty) -> String {
|
||||
|
@ -83,4 +83,10 @@ impl IgnoreGenericNew {
|
||||
pub fn new<T>() -> Self { IgnoreGenericNew } // the derived Default does not make sense here as the result depends on T
|
||||
}
|
||||
|
||||
pub trait TraitWithNew: Sized {
|
||||
fn new() -> Self {
|
||||
panic!()
|
||||
}
|
||||
}
|
||||
|
||||
fn main() {}
|
||||
|
Loading…
Reference in New Issue
Block a user