diff options
| -rw-r--r-- | src/librustc_lint/builtin.rs | 2 | ||||
| -rw-r--r-- | src/librustc_lint/types.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_lint/builtin.rs b/src/librustc_lint/builtin.rs index f51d7662d05..593d4802704 100644 --- a/src/librustc_lint/builtin.rs +++ b/src/librustc_lint/builtin.rs @@ -2172,7 +2172,7 @@ impl ClashingExternDeclarations { loop { if let ty::Adt(def, substs) = ty.kind { let is_transparent = def.subst(tcx, substs).repr.transparent(); - let is_non_null = crate::types::guaranteed_nonnull_optimization(tcx, &def); + let is_non_null = crate::types::nonnull_optimization_guaranteed(tcx, &def); debug!( "non_transparent_ty({:?}) -- type is transparent? {}, type is non-null? {}", ty, is_transparent, is_non_null diff --git a/src/librustc_lint/types.rs b/src/librustc_lint/types.rs index 849e8df1e5f..35c462c24c8 100644 --- a/src/librustc_lint/types.rs +++ b/src/librustc_lint/types.rs @@ -527,7 +527,7 @@ enum FfiResult<'tcx> { FfiUnsafe { ty: Ty<'tcx>, reason: String, help: Option<String> }, } -crate fn guaranteed_nonnull_optimization<'tcx>(tcx: TyCtxt<'tcx>, def: &ty::AdtDef) -> bool { +crate fn nonnull_optimization_guaranteed<'tcx>(tcx: TyCtxt<'tcx>, def: &ty::AdtDef) -> bool { tcx.get_attrs(def.did) .iter() .any(|a| tcx.sess.check_name(a, sym::rustc_nonnull_optimization_guaranteed)) @@ -541,7 +541,7 @@ crate fn ty_is_known_nonnull<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>, mode: C ty::Ref(..) => true, ty::Adt(def, _) if def.is_box() && matches!(mode, CItemKind::Definition) => true, ty::Adt(def, substs) if def.repr.transparent() && !def.is_union() => { - let marked_non_null = guaranteed_nonnull_optimization(tcx, &def); + let marked_non_null = nonnull_optimization_guaranteed(tcx, &def); if marked_non_null { return true; |