mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Appease clippy again

Browse Source
This commit is contained in:
Michael Goulet 2022-09-06 17:27:47 +00:00
parent 55df9201fe
commit 526511e86b
7 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compiler/rustc_ast_lowering/src/lib.rs
View File

@ -1376,13 +1376,16 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
ImplTraitContext::Disallowed( ImplTraitContext::Disallowed(
position @ (ImplTraitPosition::TraitReturn | ImplTraitPosition::ImplReturn), position @ (ImplTraitPosition::TraitReturn | ImplTraitPosition::ImplReturn),
) => { ) => {
self.tcx.sess.create_feature_err( self.tcx
MisplacedImplTrait { .sess
span: t.span, .create_feature_err(
position: DiagnosticArgFromDisplay(&position), MisplacedImplTrait {
}, span: t.span,
sym::return_position_impl_trait_in_trait, position: DiagnosticArgFromDisplay(&position),
).emit(); },
sym::return_position_impl_trait_in_trait,
)
.emit();
hir::TyKind::Err hir::TyKind::Err
} }
ImplTraitContext::Disallowed(position) => { ImplTraitContext::Disallowed(position) => {

2
src/tools/clippy/clippy_lints/src/dereference.rs
View File

@ -959,7 +959,7 @@ fn binding_ty_auto_deref_stability<'tcx>(
)) ))
.is_sized(cx.tcx.at(DUMMY_SP), cx.param_env.without_caller_bounds()), .is_sized(cx.tcx.at(DUMMY_SP), cx.param_env.without_caller_bounds()),
), ),
TyKind::OpaqueDef(..) | TyKind::ImplTraitInTrait(..) | TyKind::Infer | TyKind::Typeof(..) | TyKind::TraitObject(..) | TyKind::Err => { TyKind::OpaqueDef(..) | TyKind::Infer | TyKind::Typeof(..) | TyKind::TraitObject(..) | TyKind::Err => {
Position::ReborrowStable(precedence) Position::ReborrowStable(precedence)
}, },
}; };

2
src/tools/clippy/clippy_lints/src/lifetimes.rs
View File

@ -441,7 +441,7 @@ impl<'a, 'tcx> Visitor<'tcx> for RefVisitor<'a, 'tcx> {
fn visit_ty(&mut self, ty: &'tcx Ty<'_>) { fn visit_ty(&mut self, ty: &'tcx Ty<'_>) {
match ty.kind { match ty.kind {
TyKind::OpaqueDef(item, bounds) => { TyKind::OpaqueDef(item, bounds, _) => {
let map = self.cx.tcx.hir(); let map = self.cx.tcx.hir();
let item = map.item(item); let item = map.item(item);
let len = self.lts.len(); let len = self.lts.len();

2
src/tools/clippy/clippy_lints/src/manual_async_fn.rs
View File

@ -103,7 +103,7 @@ fn future_trait_ref<'tcx>(
ty: &'tcx Ty<'tcx>, ty: &'tcx Ty<'tcx>,
) -> Option<(&'tcx TraitRef<'tcx>, Vec<LifetimeName>)> { ) -> Option<(&'tcx TraitRef<'tcx>, Vec<LifetimeName>)> {
if_chain! { if_chain! {
if let TyKind::OpaqueDef(item_id, bounds) = ty.kind; if let TyKind::OpaqueDef(item_id, bounds, false) = ty.kind;
let item = cx.tcx.hir().item(item_id); let item = cx.tcx.hir().item(item_id);
if let ItemKind::OpaqueTy(opaque) = &item.kind; if let ItemKind::OpaqueTy(opaque) = &item.kind;
if let Some(trait_ref) = opaque.bounds.iter().find_map(|bound| { if let Some(trait_ref) = opaque.bounds.iter().find_map(|bound| {

3
src/tools/clippy/clippy_lints/src/missing_doc.rs
View File

@ -147,8 +147,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingDoc {
| hir::ItemKind::TraitAlias(..) | hir::ItemKind::TraitAlias(..)
| hir::ItemKind::TyAlias(..) | hir::ItemKind::TyAlias(..)
| hir::ItemKind::Union(..) | hir::ItemKind::Union(..)
| hir::ItemKind::OpaqueTy(..) | hir::ItemKind::OpaqueTy(..) => {},
| hir::ItemKind::ImplTraitPlaceholder(..) => {},
hir::ItemKind::ExternCrate(..) hir::ItemKind::ExternCrate(..)
| hir::ItemKind::ForeignMod { .. } | hir::ItemKind::ForeignMod { .. }
| hir::ItemKind::GlobalAsm(..) | hir::ItemKind::GlobalAsm(..)

1
src/tools/clippy/clippy_lints/src/missing_inline.rs
View File

@ -128,7 +128,6 @@ impl<'tcx> LateLintPass<'tcx> for MissingInline {
| hir::ItemKind::TyAlias(..) | hir::ItemKind::TyAlias(..)
| hir::ItemKind::Union(..) | hir::ItemKind::Union(..)
| hir::ItemKind::OpaqueTy(..) | hir::ItemKind::OpaqueTy(..)
| hir::ItemKind::ImplTraitPlaceholder(..)
| hir::ItemKind::ExternCrate(..) | hir::ItemKind::ExternCrate(..)
| hir::ItemKind::ForeignMod { .. } | hir::ItemKind::ForeignMod { .. }
| hir::ItemKind::Impl { .. } | hir::ItemKind::Impl { .. }

6
src/tools/clippy/clippy_utils/src/hir_utils.rs
View File

@ -987,12 +987,10 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
} }
}, },
TyKind::Path(ref qpath) => self.hash_qpath(qpath), TyKind::Path(ref qpath) => self.hash_qpath(qpath),
TyKind::OpaqueDef(_, arg_list) => { TyKind::OpaqueDef(_, arg_list, in_trait) => {
self.hash_generic_args(arg_list); self.hash_generic_args(arg_list);
in_trait.hash(&mut self.s);
}, },
TyKind::ImplTraitInTrait(_) => {
// Do nothing
}
TyKind::TraitObject(_, lifetime, _) => { TyKind::TraitObject(_, lifetime, _) => {
self.hash_lifetime(*lifetime); self.hash_lifetime(*lifetime);
}, },