oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tighten up MergeFrom trait (#38473)

Browse Source 
Release Notes:

- N/A
This commit is contained in:
Conrad Irwin
2025-09-18 22:28:17 -06:00
committed by GitHub
parent c826ce6fc6
commit e62dd2a0e5
6 changed files with 97 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/language/src/language_settings.rs
+1 -1
View File
@@ -582,7 +582,7 @@ impl settings::Settings for AllLanguageSettings {
let mut languages = HashMap::default();
for (language_name, settings) in &all_languages.languages.0 {
let mut language_settings = all_languages.defaults.clone();
settings::merge_from::MergeFrom::merge_from(&mut language_settings, Some(settings));
settings::merge_from::MergeFrom::merge_from(&mut language_settings, settings);
languages.insert(
LanguageName(language_name.clone()),
load_from_content(language_settings),