Fewer deprecations

heroku · Sep 21, 2024 · a0f781b · a0f781b
1 parent 0b32324
commit a0f781b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/buildpacks/ruby/src/main.rs b/buildpacks/ruby/src/main.rs
@@ -115,6 +115,7 @@ impl Buildpack for RubyBuildpack {
     }
 
     #[allow(clippy::too_many_lines)]
+    #[allow(deprecated)]
     fn build(&self, context: BuildContext<Self>) -> libcnb::Result<BuildResult, Self::Error> {
         let mut logger = BuildLog::new(stdout()).buildpack_name("Heroku Ruby Buildpack");
         let warn_later = WarnGuard::new(stdout());
@@ -154,7 +155,6 @@ impl Buildpack for RubyBuildpack {
                 fmt::value(ruby_version.to_string()),
                 fmt::value(gemfile_lock.ruby_source())
             ));
-            #[allow(deprecated)]
             let ruby_layer = context //
                 .handle_layer(
                     layer_name!("ruby"),
@@ -168,7 +168,6 @@ impl Buildpack for RubyBuildpack {
                         },
                     },
                 )?;
-            #[allow(deprecated)]
             let env = ruby_layer.env.apply(Scope::Build, &env);
             (section.end_section(), env)
         };
@@ -180,7 +179,6 @@ impl Buildpack for RubyBuildpack {
                 fmt::value(bundler_version.to_string()),
                 fmt::value(gemfile_lock.bundler_source())
             ));
-            #[allow(deprecated)]
             let download_bundler_layer = context.handle_layer(
                 layer_name!("bundler"),
                 BundleDownloadLayer {
@@ -191,8 +189,6 @@ impl Buildpack for RubyBuildpack {
                     _section_logger: section.as_ref(),
                 },
             )?;
-
-            #[allow(deprecated)]
             let env = download_bundler_layer.env.apply(Scope::Build, &env);
 
             (section.end_section(), env)
@@ -201,7 +197,6 @@ impl Buildpack for RubyBuildpack {
         // ## Bundle install
         (logger, env) = {
             let section = logger.section("Bundle install");
-            #[allow(deprecated)]
             let bundle_install_layer = context.handle_layer(
                 layer_name!("gems"),
                 BundleInstallLayer {
@@ -231,7 +226,6 @@ impl Buildpack for RubyBuildpack {
                     },
                 },
             )?;
-            #[allow(deprecated)]
             let env = bundle_install_layer.env.apply(Scope::Build, &env);
             (section.end_section(), env)
         };

diff --git a/commons/src/cache/app_cache.rs b/commons/src/cache/app_cache.rs
@@ -236,6 +236,7 @@ pub enum PathState {
 /// # Errors
 ///
 /// - If the layer cannot be created
+#[allow(deprecated)]
 pub fn build<B: libcnb::Buildpack>(
     context: &BuildContext<B>,
     config: CacheConfig,
@@ -249,12 +250,10 @@ pub fn build<B: libcnb::Buildpack>(
     let layer_name = create_layer_name(&context.app_dir, &path)?;
     let create_state = layer_name_cache_state(&context.layers_dir, &layer_name);
 
-    #[allow(deprecated)]
     let layer = context
         .handle_layer(layer_name, InAppDirCacheLayer::new(path.clone()))
         .map_err(|error| CacheError::InternalLayerError(format!("{error:?}")))?;
 
-    #[allow(deprecated)]
     let cache = layer.path;
 
     Ok(AppCache {

diff --git a/commons/src/cache/in_app_dir_cache_layer.rs b/commons/src/cache/in_app_dir_cache_layer.rs
@@ -58,7 +58,6 @@ where
         }
     }
 
-    #[allow(deprecated)]
     fn create(
         &mut self,
         _context: &BuildContext<Self::Buildpack>,
@@ -70,7 +69,6 @@ where
         .build()
     }
 
-    #[allow(deprecated)]
     fn existing_layer_strategy(
         &mut self,
         _context: &BuildContext<Self::Buildpack>,