@@ -72,12 +72,14 @@ pub use resolver::MappedResolution;
72
72
pub use resolver:: MappedResolutionDiagnostic ;
73
73
pub use resolver:: MappedResolutionError ;
74
74
pub use resolver:: PackageJsonDepResolution ;
75
+ pub use resolver:: ResolutionKind ;
75
76
pub use resolver:: ResolverWorkspaceJsrPackage ;
76
77
pub use resolver:: SpecifiedImportMap ;
77
78
pub use resolver:: WorkspaceResolvePkgJsonFolderError ;
78
79
pub use resolver:: WorkspaceResolvePkgJsonFolderErrorKind ;
79
80
pub use resolver:: WorkspaceResolver ;
80
81
pub use resolver:: WorkspaceResolverCreateError ;
82
+ pub use resolver:: WorkspaceResolverDiagnostic ;
81
83
82
84
#[ allow( clippy:: disallowed_types) ]
83
85
type UrlRc = crate :: sync:: MaybeArc < Url > ;
@@ -558,11 +560,11 @@ impl Workspace {
558
560
} )
559
561
}
560
562
561
- pub fn create_resolver (
563
+ pub fn create_resolver < TSys : FsMetadata + FsRead > (
562
564
& self ,
563
- sys : & impl FsRead ,
565
+ sys : TSys ,
564
566
options : CreateResolverOptions ,
565
- ) -> Result < WorkspaceResolver , WorkspaceResolverCreateError > {
567
+ ) -> Result < WorkspaceResolver < TSys > , WorkspaceResolverCreateError > {
566
568
WorkspaceResolver :: from_workspace ( self , sys, options)
567
569
}
568
570
@@ -2124,7 +2126,7 @@ fn is_valid_jsr_pkg_name(name: &str) -> bool {
2124
2126
}
2125
2127
2126
2128
#[ cfg( test) ]
2127
- mod test {
2129
+ pub mod test {
2128
2130
use std:: cell:: RefCell ;
2129
2131
use std:: collections:: HashMap ;
2130
2132
@@ -2145,7 +2147,27 @@ mod test {
2145
2147
2146
2148
use super :: * ;
2147
2149
2148
- struct UnreachableSys ;
2150
+ pub struct UnreachableSys ;
2151
+
2152
+ impl sys_traits:: BaseFsMetadata for UnreachableSys {
2153
+ type Metadata = sys_traits:: impls:: RealFsMetadata ;
2154
+
2155
+ #[ doc( hidden) ]
2156
+ fn base_fs_metadata (
2157
+ & self ,
2158
+ _path : & Path ,
2159
+ ) -> std:: io:: Result < Self :: Metadata > {
2160
+ unreachable ! ( )
2161
+ }
2162
+
2163
+ #[ doc( hidden) ]
2164
+ fn base_fs_symlink_metadata (
2165
+ & self ,
2166
+ _path : & Path ,
2167
+ ) -> std:: io:: Result < Self :: Metadata > {
2168
+ unreachable ! ( )
2169
+ }
2170
+ }
2149
2171
2150
2172
impl sys_traits:: BaseFsRead for UnreachableSys {
2151
2173
fn base_fs_read (
@@ -2713,7 +2735,7 @@ mod test {
2713
2735
) ;
2714
2736
let resolver = workspace_dir
2715
2737
. workspace
2716
- . create_resolver ( & UnreachableSys , Default :: default ( ) )
2738
+ . create_resolver ( UnreachableSys , Default :: default ( ) )
2717
2739
. unwrap ( ) ;
2718
2740
assert_eq ! (
2719
2741
serde_json:: from_str:: <serde_json:: Value >(
0 commit comments