Remove deprecated config key and template filters

Author: rossmacarthur

src/config/normalize.rs

@@ -1,7 +1,6 @@
 //! Normalize a raw config from the file into a [`Config`].
 
 use std::str;
-use std::str::FromStr;
 
 use anyhow::{anyhow, bail, Context as ResultExt, Error, Result};
 use indexmap::IndexMap;
@@ -83,31 +82,19 @@ fn normalize_plugin(
         remote,
         local,
         inline,
-        mut proto,
+        proto,
         reference,
         dir,
         uses,
         apply,
         profiles,
         hooks,
-        mut rest,
+        rest,
     } = raw_plugin;
 
     let is_reference_some = reference.is_some();
     let is_gist_or_github = gist.is_some() || github.is_some();
 
-    // Handle some deprecated items :/
-    if proto.is_none() {
-        if let Some(protocol) = try_pop_toml_value(&mut rest, "protocol") {
-            warnings.push(anyhow!(
-                "use of deprecated config key: `plugins.{name}.protocol`, please use \
-                 `plugins.{name}.proto` instead",
-                name = name,
-            ));
-            proto = Some(protocol);
-        }
-    }
-
     check_extra_toml(rest, |key| {
         warnings.push(anyhow!("unused config key: `plugins.{name}.{key}`"));
     });
@@ -217,23 +204,6 @@ impl Source {
     }
 }
 
-/// Try and pop the TOML value from the table.
-fn try_pop_toml_value<T>(rest: &mut Option<toml::Value>, key: &str) -> Option<T>
-where
-    T: FromStr,
-{
-    if let Some(toml::Value::Table(table)) = rest {
-        if let Some(toml::Value::String(s)) = table.get(key) {
-            let result = s.parse().ok();
-            if result.is_some() {
-                table.remove(key);
-            }
-            return result;
-        }
-    }
-    None
-}
-
 /// Call the given function on all extra TOML keys.
 fn check_extra_toml<F>(rest: Option<toml::Value>, mut f: F)
 where

src/lock/script.rs

@@ -1,4 +1,4 @@
-use anyhow::{Context as ResultExt, Error, Result};
+use anyhow::{Context as ResultExt, Result};
 use once_cell::sync::Lazy;
 use serde::Serialize;
 use std::collections::BTreeMap;
@@ -18,7 +18,7 @@ struct ExternalData<'a> {
 
 impl LockedConfig {
     /// Generate the script.
-    pub fn script(&self, ctx: &Context, warnings: &mut Vec<Error>) -> Result<String> {
+    pub fn script(&self, ctx: &Context) -> Result<String> {
         static USED_GET: Lazy<Mutex<bool>> = Lazy::new(|| Mutex::new(false));
 
         let mut engine = upon::Engine::new();
@@ -105,14 +105,6 @@ impl LockedConfig {
             }
         }
 
-        if *USED_GET.lock().unwrap() {
-            warnings.push(Error::msg(
-                "use of deprecated filter `get` in [templates], please use the `?.` operator \
-                 instead.\nFor example: `{{ hooks | get: \"pre\" | nl }}` can be written `{{ \
-                 hooks?.pre | nl }}`",
-            ));
-        }
-
         Ok(script)
     }
 }

src/main.rs

@@ -233,7 +233,7 @@ fn source(ctx: &Context, warnings: &mut Vec<Error>) -> Result<()> {
     };
 
     let script = locked_config
-        .script(ctx, warnings)
+        .script(ctx)
         .context("failed to render source")?;
 
     if to_path && locked_config.errors.is_empty() {

tests/lib.rs

@@ -422,14 +422,6 @@ fn lock_and_source_hooks() -> io::Result<()> {
     Ok(())
 }
 
-#[test]
-fn lock_and_source_deprecated_get_filter() -> io::Result<()> {
-    let case = TestCase::load("deprecated_get_filter")?;
-    case.run()?;
-    check_sheldon_test(&case.dirs.data).unwrap();
-    Ok(())
-}
-
 #[test]
 fn directories_default() -> io::Result<()> {
     let dirs = TestDirs::default()?;