mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-26 10:40:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix Clippy warnings in settings crate (#8700)

Browse source 
This PR fixes a number of Clippy warnings in the `settings` crate.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-03-02 00:29:29 -05:00 committed by GitHub
parent 26fdd149e1
commit 5c2bd816ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/settings/src/settings_file.rs
View file

@ -6,7 +6,7 @@ use gpui::{AppContext, BackgroundExecutor};
use std::{io::ErrorKind, path::PathBuf, sync::Arc, time::Duration};
use util::{paths, ResultExt};
pub const EMPTY_THEME_NAME: &'static str = "empty-theme";
pub const EMPTY_THEME_NAME: &str = "empty-theme";
#[cfg(any(test, feature = "test-support"))]
pub fn test_settings() -> String {
@ -52,7 +52,7 @@ pub fn watch_config_file(
}
if let Ok(contents) = fs.load(&path).await {
if !tx.unbounded_send(contents).is_ok() {
if tx.unbounded_send(contents).is_err() {
break;
}
}
@ -100,7 +100,7 @@ async fn load_settings(fs: &Arc<dyn Fs>) -> Result<String> {
return Ok(crate::initial_user_settings_content().to_string());
}
}
return Err(err);
Err(err)
}
}
}

34
crates/settings/src/settings_store.rs
View file

@ -96,7 +96,7 @@ pub trait Settings: 'static + Send + Sync {
}
#[track_caller]
fn get_global<'a>(cx: &'a AppContext) -> &'a Self
fn get_global(cx: &AppContext) -> &Self
where
Self: Sized,
{
@ -104,7 +104,7 @@ pub trait Settings: 'static + Send + Sync {
}
#[track_caller]
fn try_read_global<'a, R>(cx: &'a AsyncAppContext, f: impl FnOnce(&Self) -> R) -> Option<R>
fn try_read_global<R>(cx: &AsyncAppContext, f: impl FnOnce(&Self) -> R) -> Option<R>
where
Self: Sized,
{
@ -112,7 +112,7 @@ pub trait Settings: 'static + Send + Sync {
}
#[track_caller]
fn override_global<'a>(settings: Self, cx: &'a mut AppContext)
fn override_global(settings: Self, cx: &mut AppContext)
where
Self: Sized,
{
@ -210,10 +210,10 @@ impl SettingsStore {
if let Some(release_settings) = &self
.raw_user_settings
.get(&*release_channel::RELEASE_CHANNEL.dev_name())
.get(release_channel::RELEASE_CHANNEL.dev_name())
{
if let Some(release_settings) = setting_value
.deserialize_setting(&release_settings)
.deserialize_setting(release_settings)
.log_err()
{
user_values_stack.push(release_settings);
@ -316,7 +316,7 @@ impl SettingsStore {
let raw_settings = parse_json_with_comments::<serde_json::Value>(text).unwrap_or_default();
let old_content = match setting.deserialize_setting(&raw_settings) {
Ok(content) => content.0.downcast::<T::FileContent>().unwrap(),
Err(_) => Box::new(T::FileContent::default()),
Err(_) => Box::<<T as Settings>::FileContent>::default(),
};
let mut new_content = old_content.clone();
update(&mut new_content);
@ -340,7 +340,7 @@ impl SettingsStore {
&new_value,
&mut edits,
);
return edits;
edits
}
/// Configure the tab sized when updating JSON files.
@ -543,10 +543,10 @@ impl SettingsStore {
if let Some(release_settings) = &self
.raw_user_settings
.get(&*release_channel::RELEASE_CHANNEL.dev_name())
.get(release_channel::RELEASE_CHANNEL.dev_name())
{
if let Some(release_settings) = setting_value
.deserialize_setting(&release_settings)
.deserialize_setting(release_settings)
.log_err()
{
user_settings_stack.push(release_settings);
@ -662,7 +662,7 @@ impl<T: Settings> AnySettingValue for SettingValue<T> {
fn value_for_path(&self, path: Option<(usize, &Path)>) -> &dyn Any {
if let Some((root_id, path)) = path {
for (settings_root_id, settings_path, value) in self.local_values.iter().rev() {
if root_id == *settings_root_id && path.starts_with(&settings_path) {
if root_id == *settings_root_id && path.starts_with(settings_path) {
return value;
}
}
@ -755,8 +755,8 @@ fn replace_value_in_json_text(
tab_size: usize,
new_value: &serde_json::Value,
) -> (Range<usize>, String) {
const LANGUAGE_OVERRIDES: &'static str = "language_overrides";
const LANGUAGES: &'static str = "languages";
const LANGUAGE_OVERRIDES: &str = "language_overrides";
const LANGUAGES: &str = "languages";
lazy_static! {
static ref PAIR_QUERY: tree_sitter::Query = tree_sitter::Query::new(
@ -799,15 +799,15 @@ fn replace_value_in_json_text(
break;
}
first_key_start.get_or_insert_with(|| key_range.start);
first_key_start.get_or_insert(key_range.start);
let found_key = text
.get(key_range.clone())
.map(|key_text| {
if key_path[depth] == LANGUAGES && has_language_overrides {
return key_text == format!("\"{}\"", LANGUAGE_OVERRIDES);
key_text == format!("\"{}\"", LANGUAGE_OVERRIDES)
} else {
return key_text == format!("\"{}\"", key_path[depth]);
key_text == format!("\"{}\"", key_path[depth])
}
})
.unwrap_or(false);
@ -820,9 +820,9 @@ fn replace_value_in_json_text(
if depth == key_path.len() {
break;
} else {
first_key_start = None;
}
first_key_start = None;
}
}