mirror of
https://github.com/mountain-loop/yaak.git
synced 2026-04-24 01:28:35 +02:00
Align lint fixes with main and resolve merge conflicts
- Convert biome-ignore to oxlint-disable-next-line across client app - Fix no-base-to-string with type narrowing instead of suppressions - Fix no-floating-promises with fireAndForget() in proxy app - Fix restrict-template-expressions with String() wrapping - Resolve leftover merge conflict markers in manager.rs - Remove duplicate cmd_plugin_init_errors from lib.rs - Add graphql as explicit dependency in yaak-client Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -187,11 +187,7 @@ impl PluginManager {
|
||||
let init_errors = plugin_manager.initialize_all_plugins(plugins, plugin_context).await;
|
||||
if !init_errors.is_empty() {
|
||||
for (dir, err) in &init_errors {
|
||||
<<<<<<< HEAD
|
||||
error!("Failed to initialize plugin {dir}: {err}");
|
||||
=======
|
||||
warn!("Plugin failed to initialize: {dir}: {err}");
|
||||
>>>>>>> main
|
||||
}
|
||||
*plugin_manager.init_errors.lock().await = init_errors;
|
||||
}
|
||||
@@ -199,13 +195,8 @@ impl PluginManager {
|
||||
Ok(plugin_manager)
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
/// Take and clear any plugin initialization errors.
|
||||
/// Returns the errors only once — subsequent calls return an empty list.
|
||||
=======
|
||||
/// Take any initialization errors, clearing them from the manager.
|
||||
/// Returns a list of `(plugin_directory, error_message)` pairs.
|
||||
>>>>>>> main
|
||||
pub async fn take_init_errors(&self) -> Vec<(String, String)> {
|
||||
std::mem::take(&mut *self.init_errors.lock().await)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user