fix

dprint · Nov 24, 2023 · f5629d7 · f5629d7
1 parent 09f1158
commit f5629d7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.73.0"
+channel = "1.74.0"
 components = ["clippy", "rustfmt"]
diff --git a/src/generation/generate.rs b/src/generation/generate.rs
@@ -62,7 +62,7 @@ fn gen_node_with_inner<'a>(
   inner_gen: impl FnOnce(PrintItems, &mut Context<'a, '_>) -> PrintItems,
 ) -> PrintItems {
   // store info
-  let past_current_node = context.current_node.replace(node.clone());
+  let past_current_node = context.current_node.replace(node);
   let parent_end = past_current_node.as_ref().map(|n| n.end());
   let node_end = node.end();
   let is_root = past_current_node.is_none();

diff --git a/src/wasm_plugin.rs b/src/wasm_plugin.rs
@@ -2,21 +2,17 @@ use dprint_core::configuration::ConfigKeyMap;
 use dprint_core::configuration::GlobalConfiguration;
 use dprint_core::configuration::ResolveConfigurationResult;
 use dprint_core::generate_plugin_code;
+use dprint_core::plugins::FileMatchingInfo;
 use dprint_core::plugins::FormatResult;
 use dprint_core::plugins::PluginInfo;
 use dprint_core::plugins::SyncPluginHandler;
+use dprint_core::plugins::SyncPluginInfo;
 use std::path::Path;
 
 use super::configuration::resolve_config;
 use super::configuration::Configuration;
 
-struct JsonPluginHandler {}
-
-impl JsonPluginHandler {
-  pub const fn new() -> Self {
-    JsonPluginHandler {}
-  }
-}
+struct JsonPluginHandler;
 
 impl SyncPluginHandler<Configuration> for JsonPluginHandler {
   fn resolve_config(
@@ -27,20 +23,24 @@ impl SyncPluginHandler<Configuration> for JsonPluginHandler {
     resolve_config(config, global_config)
   }
 
-  fn plugin_info(&mut self) -> PluginInfo {
+  fn plugin_info(&mut self) -> SyncPluginInfo {
     let version = env!("CARGO_PKG_VERSION").to_string();
-    PluginInfo {
-      name: env!("CARGO_PKG_NAME").to_string(),
-      version: version.clone(),
-      config_key: "json".to_string(),
-      file_extensions: vec!["json".to_string(), "jsonc".to_string()],
-      file_names: vec![],
-      help_url: "https://dprint.dev/plugins/json".to_string(),
-      config_schema_url: format!(
-        "https://plugins.dprint.dev/dprint/dprint-plugin-json/{}/schema.json",
-        version
-      ),
-      update_url: Some("https://plugins.dprint.dev/dprint/dprint-plugin-json/latest.json".to_string()),
+    SyncPluginInfo {
+      info: PluginInfo {
+        name: env!("CARGO_PKG_NAME").to_string(),
+        version: version.clone(),
+        config_key: "json".to_string(),
+        help_url: "https://dprint.dev/plugins/json".to_string(),
+        config_schema_url: format!(
+          "https://plugins.dprint.dev/dprint/dprint-plugin-json/{}/schema.json",
+          version
+        ),
+        update_url: Some("https://plugins.dprint.dev/dprint/dprint-plugin-json/latest.json".to_string()),
+      },
+      file_matching: FileMatchingInfo {
+        file_extensions: vec!["json".to_string(), "jsonc".to_string()],
+        file_names: vec![],
+      },
     }
   }
 
@@ -59,4 +59,4 @@ impl SyncPluginHandler<Configuration> for JsonPluginHandler {
   }
 }
 
-generate_plugin_code!(JsonPluginHandler, JsonPluginHandler::new());
+generate_plugin_code!(JsonPluginHandler, JsonPluginHandler);