fix warning

Author: HKalbasi

crates/hir-ty/src/layout.rs

@@ -6,7 +6,7 @@ use hir_def::LocalFieldId;
 
 use crate::{db::HirDatabase, Interner, Substitution, Ty};
 
-use self::adt::univariant_uninterned;
+use self::adt::univariant;
 pub use self::{
     adt::{layout_of_adt_query, layout_of_adt_recover},
     target::current_target_data_layout_query,
@@ -113,7 +113,7 @@ pub fn layout_of_ty(db: &dyn HirDatabase, ty: &Ty) -> Result<Layout, LayoutError
         TyKind::Tuple(len, tys) => {
             let kind = if *len == 0 { StructKind::AlwaysSized } else { StructKind::MaybeUnsized };
 
-            univariant_uninterned(
+            univariant(
                 dl,
                 &tys.iter(Interner)
                     .map(|k| layout_of_ty(db, k.assert_ty_ref(Interner)))
@@ -197,7 +197,7 @@ pub fn layout_of_ty(db: &dyn HirDatabase, ty: &Ty) -> Result<Layout, LayoutError
             scalar_pair(dl, data_ptr, metadata)
         }
         TyKind::FnDef(_, _) => {
-            univariant_uninterned(dl, &[], &ReprOptions::default(), StructKind::AlwaysSized)?
+            univariant(dl, &[], &ReprOptions::default(), StructKind::AlwaysSized)?
         }
         TyKind::Str => Layout {
             variants: Variants::Single,
@@ -217,7 +217,7 @@ pub fn layout_of_ty(db: &dyn HirDatabase, ty: &Ty) -> Result<Layout, LayoutError
         },
         TyKind::Dyn(_) | TyKind::Foreign(_) => {
             let mut unit =
-                univariant_uninterned(dl, &[], &ReprOptions::default(), StructKind::AlwaysSized)?;
+                univariant(dl, &[], &ReprOptions::default(), StructKind::AlwaysSized)?;
             match unit.abi {
                 Abi::Aggregate { ref mut sized } => *sized = false,
                 _ => user_error!("bug"),

crates/hir-ty/src/layout/adt.rs

@@ -115,7 +115,7 @@ pub fn layout_of_adt_query(
             }
         };
 
-        let mut st = univariant_uninterned(dl, &variants[v], &repr, kind)?;
+        let mut st = univariant(dl, &variants[v], &repr, kind)?;
         st.variants = Variants::Single;
 
         if is_unsafe_cell(def, db) {
@@ -173,7 +173,7 @@ pub fn layout_of_adt_query(
         let mut variant_layouts = variants
             .iter()
             .map(|(j, v)| {
-                let mut st = univariant_uninterned(dl, v, &repr, StructKind::AlwaysSized)?;
+                let mut st = univariant(dl, v, &repr, StructKind::AlwaysSized)?;
                 st.variants = Variants::Single;
 
                 align = align.max(st.align);
@@ -367,7 +367,7 @@ pub fn layout_of_adt_query(
     let mut layout_variants = variants
         .iter()
         .map(|(i, field_layouts)| {
-            let mut st = univariant_uninterned(
+            let mut st = univariant(
                 dl,
                 &field_layouts,
                 &repr,
@@ -600,7 +600,7 @@ pub fn layout_of_adt_recover(
     user_error!("infinite sized recursive type");
 }
 
-pub fn univariant_uninterned(
+pub(crate) fn univariant(
     dl: &TargetDataLayout,
     fields: &[Layout],
     repr: &ReprOptions,