File tree 3 files changed +12
-6
lines changed 3 files changed +12
-6
lines changed Original file line number Diff line number Diff line change @@ -525,6 +525,7 @@ pub struct ClientCommandsConfig {
525
525
pub trigger_parameter_hints : bool ,
526
526
}
527
527
528
+ #[ derive( Debug ) ]
528
529
pub struct ConfigUpdateError {
529
530
errors : Vec < ( String , serde_json:: Error ) > ,
530
531
}
@@ -1437,7 +1438,6 @@ fn get_field<T: DeserializeOwned>(
1437
1438
default : & str ,
1438
1439
) -> T {
1439
1440
let default = serde_json:: from_str ( default) . unwrap ( ) ;
1440
-
1441
1441
// XXX: check alias first, to work-around the VS Code where it pre-fills the
1442
1442
// defaults instead of sending an empty object.
1443
1443
alias
Original file line number Diff line number Diff line change @@ -685,7 +685,7 @@ version = \"0.0.0\"
685
685
#[ test]
686
686
fn out_dirs_check ( ) {
687
687
if skip_slow_tests ( ) {
688
- return ;
688
+ // return;
689
689
}
690
690
691
691
let server = Project :: with_fixture (
@@ -737,7 +737,9 @@ fn main() {
737
737
)
738
738
. with_config ( serde_json:: json!( {
739
739
"cargo" : {
740
- "loadOutDirsFromCheck" : true ,
740
+ "buildScripts" : {
741
+ "enable" : true
742
+ } ,
741
743
"noSysroot" : true ,
742
744
}
743
745
} ) )
@@ -890,7 +892,9 @@ pub fn foo(_input: TokenStream) -> TokenStream {
890
892
)
891
893
. with_config ( serde_json:: json!( {
892
894
"cargo" : {
893
- "loadOutDirsFromCheck" : true ,
895
+ "buildScripts" : {
896
+ "enable" : true
897
+ } ,
894
898
"noSysroot" : true ,
895
899
} ,
896
900
"procMacro" : {
Original file line number Diff line number Diff line change @@ -36,7 +36,9 @@ impl<'a> Project<'a> {
36
36
// Loading standard library is costly, let's ignore it by default
37
37
"noSysroot" : true ,
38
38
// Can't use test binary as rustc wrapper.
39
- "useRustcWrapperForBuildScripts" : false ,
39
+ "buildScripts" : {
40
+ "useRustcWrapper" : false
41
+ } ,
40
42
}
41
43
} ) ,
42
44
}
@@ -137,7 +139,7 @@ impl<'a> Project<'a> {
137
139
} ,
138
140
) ;
139
141
config. discovered_projects = Some ( discovered_projects) ;
140
- let _ = config. update ( self . config ) ;
142
+ config. update ( self . config ) . expect ( "invalid config" ) ;
141
143
142
144
Server :: new ( tmp_dir, config)
143
145
}
You can’t perform that action at this time.
0 commit comments