@@ -13,7 +13,7 @@ use crate::docbuilder::Limits;
13
13
use crate :: error:: Result ;
14
14
use crate :: repositories:: RepositoryStatsUpdater ;
15
15
use crate :: storage:: {
16
- CompressionAlgorithm , RustdocJsonFormatVersion , compress, rustdoc_archive_path,
16
+ CompressionAlgorithm , RustdocJsonFormatVersion , compress, get_file_list , rustdoc_archive_path,
17
17
rustdoc_json_path, source_archive_path,
18
18
} ;
19
19
use crate :: utils:: {
@@ -24,6 +24,7 @@ use crate::{AsyncStorage, Config, Context, InstanceMetrics, RegistryApi, Storage
24
24
use crate :: { db:: blacklist:: is_blacklisted, utils:: MetadataPackage } ;
25
25
use anyhow:: { Context as _, Error , anyhow, bail} ;
26
26
use docsrs_metadata:: { BuildTargets , DEFAULT_TARGETS , HOST_TARGET , Metadata } ;
27
+ use itertools:: Itertools as _;
27
28
use regex:: Regex ;
28
29
use rustwide:: cmd:: { Command , CommandError , SandboxBuilder , SandboxImage } ;
29
30
use rustwide:: logging:: { self , LogStorage } ;
@@ -890,7 +891,16 @@ impl RustwideBuilder {
890
891
} )
891
892
. next ( )
892
893
. ok_or_else ( || {
893
- anyhow ! ( "no JSON file found in target/doc after successful rustdoc json build" )
894
+ anyhow ! (
895
+ "no JSON file found in target/doc after successful rustdoc json build.\n \
896
+ search directory: {}\n \
897
+ files: {:?}",
898
+ json_dir. to_string_lossy( ) ,
899
+ get_file_list( & json_dir)
900
+ . filter_map( Result :: ok)
901
+ . map( |p| p. to_string_lossy( ) . to_string( ) )
902
+ . collect_vec( ) ,
903
+ )
894
904
} ) ?;
895
905
896
906
let format_version = {
@@ -1282,6 +1292,7 @@ mod tests {
1282
1292
use crate :: storage:: CompressionAlgorithm ;
1283
1293
use crate :: test:: { AxumRouterTestExt , TestEnvironment , wrapper} ;
1284
1294
use std:: { io, iter} ;
1295
+ use test_case:: test_case;
1285
1296
1286
1297
fn get_features (
1287
1298
env : & TestEnvironment ,
@@ -1700,12 +1711,12 @@ mod tests {
1700
1711
} ) ;
1701
1712
}
1702
1713
1703
- #[ test]
1714
+ #[ test_case( "scsys-macros" , "0.2.6" ) ]
1715
+ #[ test_case( "scsys-derive" , "0.2.6" ) ]
1716
+ #[ test_case( "thiserror-impl" , "1.0.26" ) ]
1704
1717
#[ ignore]
1705
- fn test_proc_macro ( ) {
1718
+ fn test_proc_macro ( crate_ : & str , version : & str ) {
1706
1719
wrapper ( |env| {
1707
- let crate_ = "thiserror-impl" ;
1708
- let version = "1.0.26" ;
1709
1720
let mut builder = RustwideBuilder :: init ( env) . unwrap ( ) ;
1710
1721
builder. update_toolchain ( ) ?;
1711
1722
assert ! (
0 commit comments