nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-06 03:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do the check even when the feature is not enabled

Browse Source
This commit is contained in:
Deadbeef 2021-06-28 11:13:32 +08:00
parent 22a8d46ed3
commit 5e178b29b4
No known key found for this signature in database
GPG Key ID: 6525773485376D92
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/rustc_passes/src/check_const.rs
View File

@ -60,10 +60,8 @@ impl NonConstExpr {
fn check_mod_const_bodies(tcx: TyCtxt<'_>, module_def_id: LocalDefId) { fn check_mod_const_bodies(tcx: TyCtxt<'_>, module_def_id: LocalDefId) {
let mut vis = CheckConstVisitor::new(tcx); let mut vis = CheckConstVisitor::new(tcx);
tcx.hir().visit_item_likes_in_module(module_def_id, &mut vis.as_deep_visitor()); tcx.hir().visit_item_likes_in_module(module_def_id, &mut vis.as_deep_visitor());
if tcx.features().enabled(sym::const_trait_impl) {
tcx.hir().visit_item_likes_in_module(module_def_id, &mut CheckConstTraitVisitor::new(tcx)); tcx.hir().visit_item_likes_in_module(module_def_id, &mut CheckConstTraitVisitor::new(tcx));
} }
}
pub(crate) fn provide(providers: &mut Providers) { pub(crate) fn provide(providers: &mut Providers) {
*providers = Providers { check_mod_const_bodies, ..*providers }; *providers = Providers { check_mod_const_bodies, ..*providers };
@ -80,6 +78,8 @@ impl<'tcx> CheckConstTraitVisitor<'tcx> {
} }
impl<'tcx> hir::itemlikevisit::ItemLikeVisitor<'tcx> for CheckConstTraitVisitor<'tcx> { impl<'tcx> hir::itemlikevisit::ItemLikeVisitor<'tcx> for CheckConstTraitVisitor<'tcx> {
/// check for const trait impls, and errors if the impl uses provided/default functions
/// of the trait being implemented; as those provided functions can be non-const.
fn visit_item(&mut self, item: &'hir hir::Item<'hir>) { fn visit_item(&mut self, item: &'hir hir::Item<'hir>) {
let _: Option<_> = try { let _: Option<_> = try {
if let hir::ItemKind::Impl(ref imp) = item.kind { if let hir::ItemKind::Impl(ref imp) = item.kind {
@ -103,6 +103,9 @@ impl<'tcx> hir::itemlikevisit::ItemLikeVisitor<'tcx> for CheckConstTraitVisitor<
.filter(|it| matches!(it.kind, hir::AssocItemKind::Fn { .. })) .filter(|it| matches!(it.kind, hir::AssocItemKind::Fn { .. }))
.count(); .count();
// number of trait functions unequal to functions in impl,
// meaning that one or more provided/default functions of the
// trait are used.
if trait_fn_cnt != impl_fn_cnt { if trait_fn_cnt != impl_fn_cnt {
self.tcx self.tcx
.sess .sess