diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index a9bde1800b..41fa7b4fbb 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs @@ -2728,10 +2728,6 @@ pub enum NumThreads { } macro_rules! _default_val { - (@verbatim: $s:literal, $ty:ty) => {{ - let default_: $ty = serde_json::from_str(&$s).unwrap(); - default_ - }}; ($default:expr, $ty:ty) => {{ let default_: $ty = $default; default_ @@ -2740,9 +2736,6 @@ macro_rules! _default_val { use _default_val as default_val; macro_rules! _default_str { - (@verbatim: $s:literal, $_ty:ty) => { - $s.to_owned() - }; ($default:expr, $ty:ty) => {{ let val = default_val!($default, $ty); serde_json::to_string_pretty(&val).unwrap() @@ -2883,7 +2876,7 @@ macro_rules! _config_data { ($(#[doc=$dox:literal])* $modname:ident: struct $name:ident <- $input:ident -> { $( $(#[doc=$doc:literal])* - $vis:vis $field:ident $(| $alias:ident)*: $ty:ty = $(@$marker:ident: )? $default:expr, + $vis:vis $field:ident $(| $alias:ident)*: $ty:ty = $default:expr, )* }) => { /// Default config values for this grouping. @@ -2920,7 +2913,7 @@ macro_rules! _config_data { impl Default for $name { fn default() -> Self { $name {$( - $field: default_val!($(@$marker:)? $default, $ty), + $field: default_val!($default, $ty), )*} } } @@ -2956,7 +2949,7 @@ macro_rules! _config_data { $({ let field = stringify!($field); let ty = stringify!($ty); - let default = default_str!($(@$marker:)? $default, $ty); + let default = default_str!($default, $ty); (field, ty, &[$($doc),*], default) },)*