Skip to content

Commit 4f8735f

Browse files
committed
Apply changes to ratoml/fixes
1 parent 97bad35 commit 4f8735f

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

crates/rust-analyzer/src/config.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,6 @@ impl Config {
892892
SnippetScopeDef::Type => SnippetScope::Type,
893893
SnippetScopeDef::Item => SnippetScope::Item,
894894
};
895-
#[allow(clippy::single_match)]
896895
match Snippet::new(
897896
&def.prefix,
898897
&def.postfix,
@@ -2833,7 +2832,7 @@ fn get_field<T: DeserializeOwned>(
28332832
})
28342833
}
28352834

2836-
fn get_field_toml<T: DeserializeOwned>(
2835+
fn get_field_toml<T: DeserializeOwned + fmt::Debug>(
28372836
toml: &toml::Table,
28382837
error_sink: &mut Vec<(String, toml::de::Error)>,
28392838
field: &'static str,
@@ -2847,12 +2846,17 @@ fn get_field_toml<T: DeserializeOwned>(
28472846
.filter_map(move |field| {
28482847
let mut pointer = field.replace('_', "/");
28492848
pointer.insert(0, '/');
2850-
toml_pointer(toml, &pointer)
2851-
.map(|it| <_>::deserialize(it.clone()).map_err(|e| (e, pointer)))
2849+
toml_pointer(toml, &pointer).map(|it| {
2850+
dbg!(&pointer, std::any::type_name::<T>());
2851+
<_>::deserialize(it.clone()).map_err(|e| (e, pointer))
2852+
})
28522853
})
28532854
.find(Result::is_ok)
28542855
.and_then(|res| match res {
2855-
Ok(it) => Some(it),
2856+
Ok(it) => {
2857+
dbg!(&it);
2858+
Some(it)
2859+
}
28562860
Err((e, pointer)) => {
28572861
tracing::warn!("Failed to deserialize config field at {}: {:?}", pointer, e);
28582862
error_sink.push((pointer, e));

0 commit comments

Comments
 (0)