Rename execute to handle

heroku · Apr 10, 2024 · 78ea79b · 78ea79b
1 parent a3c6232
commit 78ea79b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/libcnb/src/build.rs b/libcnb/src/build.rs
@@ -6,7 +6,7 @@ use crate::data::store::Store;
 use crate::data::{
     buildpack::ComponentBuildpackDescriptor, buildpack_plan::BuildpackPlan, launch::Launch,
 };
-use crate::layer::handling::LayerErrorOrBuildpackError;
+use crate::layer::trait_api::handling::LayerErrorOrBuildpackError;
 use crate::layer::{
     CachedLayerDefinition, InspectExistingAction, IntoAction, InvalidMetadataAction, LayerRef,
     UncachedLayerDefinition,
@@ -126,7 +126,7 @@ impl<B: Buildpack + ?Sized> BuildContext<B> {
     ) -> crate::Result<LayerRef<B, (), ()>, B::Error> {
         let layer_definition = layer_definition.borrow();
 
-        crate::layer::execute(
+        crate::layer::struct_api::handling::handle_layer(
             LayerTypes {
                 launch: layer_definition.launch,
                 build: layer_definition.build,
@@ -151,7 +151,7 @@ impl<B: Buildpack + ?Sized> BuildContext<B> {
     {
         let layer_definition = layer_definition.borrow();
 
-        crate::layer::execute(
+        crate::layer::struct_api::handling::handle_layer(
             LayerTypes {
                 launch: layer_definition.launch,
                 build: layer_definition.build,

diff --git a/libcnb/src/layer/struct_api/execute.rs → libcnb/src/layer/struct_api/handling.rs b/libcnb/src/layer/struct_api/execute.rs → libcnb/src/layer/struct_api/handling.rs
@@ -16,7 +16,7 @@ use serde::Serialize;
 use std::marker::PhantomData;
 use std::path::{Path, PathBuf};
 
-pub(crate) fn execute<B, M, MA, IA, MC, IC>(
+pub(crate) fn handle_layer<B, M, MA, IA, MC, IC>(
     layer_types: LayerTypes,
     invalid_metadata: &dyn Fn(&GenericMetadata) -> MA,
     inspect_existing: &dyn Fn(&M, &Path) -> IA,
@@ -90,7 +90,7 @@ where
                         LayerError::WriteLayerError(WriteLayerError::WriteLayerMetadataError(error))
                     })?;
 
-                    execute(
+                    handle_layer(
                         layer_types,
                         invalid_metadata,
                         inspect_existing,

diff --git a/libcnb/src/layer/struct_api/mod.rs b/libcnb/src/layer/struct_api/mod.rs
@@ -1,11 +1,10 @@
-pub(crate) mod execute;
+pub(crate) mod handling;
 
 use crate::layer::shared::{replace_layer_exec_d_programs, replace_layer_sboms, WriteLayerError};
 use crate::layer::LayerError;
 use crate::layer_env::LayerEnv;
 use crate::sbom::Sbom;
 use crate::Buildpack;
-pub(crate) use execute::execute;
 use libcnb_data::generic::GenericMetadata;
 use libcnb_data::layer::LayerName;
 use serde::Serialize;