File tree Expand file tree Collapse file tree 4 files changed +21
-35
lines changed Expand file tree Collapse file tree 4 files changed +21
-35
lines changed Original file line number Diff line number Diff line change @@ -40,6 +40,7 @@ members = [
4040exclude = [
4141 " build" ,
4242 " compiler/rustc_codegen_cranelift" ,
43+ " src/test/rustdoc-gui" ,
4344 # HACK(eddyb) This hardcodes the fact that our CI uses `/checkout/obj`.
4445 " obj" ,
4546 # The `x` binary is a thin wrapper that calls `x.py`, which initializes
Original file line number Diff line number Diff line change @@ -907,18 +907,27 @@ impl Step for RustdocGUI {
907907 // We remove existing folder to be sure there won't be artifacts remaining.
908908 let _ = fs:: remove_dir_all ( & out_dir) ;
909909
910- let src_path = "src/test/rustdoc-gui/src" ;
910+ let src_path = builder . build . src . join ( "src/test/rustdoc-gui/src" ) ;
911911 // We generate docs for the libraries present in the rustdoc-gui's src folder.
912- let mut cargo = Command :: new ( & builder. initial_cargo ) ;
913- cargo
914- . arg ( "doc" )
915- . arg ( "--workspace" )
916- . arg ( "--target-dir" )
917- . arg ( & out_dir)
918- . env ( "RUSTDOC" , builder. rustdoc ( self . compiler ) )
919- . env ( "RUSTC" , builder. rustc ( self . compiler ) )
920- . current_dir ( & builder. build . src . join ( src_path) ) ;
921- builder. run ( & mut cargo) ;
912+ for entry in src_path. read_dir ( ) . expect ( "read_dir call failed" ) {
913+ if let Ok ( entry) = entry {
914+ let path = entry. path ( ) ;
915+
916+ if !path. is_dir ( ) {
917+ continue ;
918+ }
919+
920+ let mut cargo = Command :: new ( & builder. initial_cargo ) ;
921+ cargo
922+ . arg ( "doc" )
923+ . arg ( "--target-dir" )
924+ . arg ( & out_dir)
925+ . env ( "RUSTDOC" , builder. rustdoc ( self . compiler ) )
926+ . env ( "RUSTC" , builder. rustc ( self . compiler ) )
927+ . current_dir ( path) ;
928+ builder. run ( & mut cargo) ;
929+ }
930+ }
922931
923932 // We now run GUI tests.
924933 let mut command = Command :: new ( & nodejs) ;
Load Diff This file was deleted.
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments