@@ -7,6 +7,8 @@ use ra_ap_hir::AdtId::{EnumId, StructId, UnionId};
77use ra_ap_hir:: { Crate , ModuleDefId } ;
88use ra_ap_load_cargo:: { load_workspace_at, LoadCargoConfig , ProcMacroServerChoice } ;
99use ra_ap_project_model:: CargoConfig ;
10+ use ra_ap_project_model:: RustLibSource ;
11+ use ra_ap_vfs:: AbsPathBuf ;
1012use std:: fs;
1113use std:: path:: { Path , PathBuf } ;
1214
@@ -30,18 +32,19 @@ fn main() -> anyhow::Result<()> {
3032 } ;
3133
3234 let config = CargoConfig {
35+ sysroot : Some ( RustLibSource :: Discover ) ,
3336 ..Default :: default ( )
3437 } ;
35- let no_progress = |_ | ( ) ;
38+ let progress = |t | ( println ! ( "progress: {}" , t ) ) ;
3639 let load_config = LoadCargoConfig {
3740 load_out_dirs_from_check : true ,
3841 with_proc_macro_server : ProcMacroServerChoice :: Sysroot ,
3942 prefill_caches : false ,
4043 } ;
4144 for input in cfg. inputs {
42- let ( db, vfs, _macro_server) =
43- load_workspace_at ( & input , & config , & load_config , & no_progress )
44- . context ( "loading inputs" ) ? ;
45+ let ( db, vfs, _macro_server) = load_workspace_at ( & input , & config , & load_config , & progress )
46+ . context ( "loading inputs" ) ? ;
47+ _macro_server . expect ( "no macro server" ) ;
4548 let crates = <dyn DefDatabase >:: crate_graph ( & db) ;
4649 for crate_id in crates. iter ( ) {
4750 let krate = Crate :: from ( crate_id) ;
0 commit comments