clippy

Conrad Irwin created 2 months ago

Change summary

crates/settings/src/settings_content.rs | 17 +++++------------
crates/settings/src/settings_file.rs    |  2 +-
crates/settings/src/settings_store.rs   | 10 ++++------
3 files changed, 10 insertions(+), 19 deletions(-)

Detailed changes

crates/settings/src/settings_content.rs

@@ -3,22 +3,15 @@ mod theme;
 pub use language::*;
 pub use theme::*;
 
-use std::borrow::Cow;
 use std::env;
-use std::num::NonZeroU32;
-use std::sync::Arc;
 
-use anyhow::Result;
-use collections::{HashMap, HashSet};
-use gpui::{App, FontFallbacks, FontFeatures, HighlightStyle, Hsla, Modifiers, SharedString};
+use collections::HashMap;
+use gpui::{App, SharedString};
 use release_channel::ReleaseChannel;
-use schemars::{JsonSchema, json_schema};
-use serde::de::{self, IntoDeserializer, MapAccess, SeqAccess, Visitor};
-use serde::{Deserialize, Deserializer, Serialize};
-use util::schemars::replace_subschema;
-use util::serde::default_true;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
 
-use crate::{ActiveSettingsProfileName, ParameterizedJsonSchema, Settings};
+use crate::{ActiveSettingsProfileName, Settings};
 
 #[derive(Debug, Default, Clone, Serialize, Deserialize, JsonSchema)]
 pub struct SettingsContent {

crates/settings/src/settings_file.rs

@@ -1,4 +1,4 @@
-use crate::{Settings, settings_content::SettingsContent, settings_store::SettingsStore};
+use crate::{settings_content::SettingsContent, settings_store::SettingsStore};
 use collections::HashSet;
 use fs::{Fs, PathEventKind};
 use futures::{StreamExt, channel::mpsc};

crates/settings/src/settings_store.rs

@@ -15,7 +15,6 @@ use serde_json::Value;
 use smallvec::SmallVec;
 use std::{
     any::{Any, TypeId, type_name},
-    env,
     fmt::Debug,
     ops::Range,
     path::{Path, PathBuf},
@@ -24,14 +23,13 @@ use std::{
 };
 use util::{
     ResultExt as _, merge_non_null_json_value_into,
-    schemars::{DefaultDenyUnknownFields, add_new_subschema},
 };
 
 pub type EditorconfigProperties = ec4rs::Properties;
 
 use crate::{
-    ActiveSettingsProfileName, ParameterizedJsonSchema, SettingsJsonSchemaParams, SettingsUiEntry,
-    VsCodeSettings, WorktreeId, default_settings, parse_json_with_comments,
+    ActiveSettingsProfileName, SettingsJsonSchemaParams, SettingsUiEntry,
+    VsCodeSettings, WorktreeId, parse_json_with_comments,
     replace_value_in_json_text,
     settings_content::{
         ExtensionsSettingsContent, ProjectSettingsContent, ServerSettingsContent, SettingsContent,
@@ -1238,12 +1236,12 @@ impl Debug for SettingsStore {
 
 impl<T: Settings> AnySettingValue for SettingValue<T> {
     fn from_file(&self, s: &SettingsContent) -> Option<Box<dyn Any>> {
-        dbg!(type_name::<T>(), TypeId::of::<T>());
+        (type_name::<T>(), TypeId::of::<T>());
         T::from_file(s).map(|result| Box::new(result) as _)
     }
 
     fn refine(&self, value: &mut dyn Any, refinements: &[&SettingsContent]) {
-        dbg!(type_name::<T>(), TypeId::of::<T>());
+        (type_name::<T>(), TypeId::of::<T>());
         let value = value.downcast_mut::<T>().unwrap();
         for refinement in refinements {
             value.refine(refinement)