@@ -37,12 +37,12 @@ pub fn build_doc(name: &str, vers: Option<&str>, target: Option<&str>) -> Result
37
37
let source_id = try!( SourceId :: crates_io ( & config) ) ;
38
38
39
39
let source_cfg_map = try!( SourceConfigMap :: new ( & config) ) ;
40
- let mut source = try!( source_cfg_map. load ( & source_id) ) ;
40
+ let mut source = try!( source_cfg_map. load ( source_id) ) ;
41
41
42
42
// update crates.io-index registry
43
43
try!( source. update ( ) ) ;
44
44
45
- let dep = try!( Dependency :: parse_no_deprecated ( name, vers, & source_id) ) ;
45
+ let dep = try!( Dependency :: parse_no_deprecated ( name, vers, source_id) ) ;
46
46
let deps = try!( source. query_vec ( & dep) ) ;
47
47
let pkgid = try!( deps. iter ( ) . map ( |p| p. package_id ( ) ) . max ( )
48
48
// FIXME: This is probably not a rusty way to handle options and results
@@ -54,7 +54,7 @@ pub fn build_doc(name: &str, vers: Option<&str>, target: Option<&str>) -> Result
54
54
55
55
let pkg_set = try!( PackageSet :: new ( & [ pkgid. clone ( ) ] , source_map, & config) ) ;
56
56
57
- let pkg = try!( pkg_set. get_one ( & pkgid) ) . clone ( ) ;
57
+ let pkg = try!( pkg_set. get_one ( pkgid) ) . clone ( ) ;
58
58
59
59
let current_dir = try!( env:: current_dir ( ) ) ;
60
60
let target_dir = PathBuf :: from ( current_dir) . join ( "cratesfyi" ) ;
@@ -79,7 +79,7 @@ pub fn build_doc(name: &str, vers: Option<&str>, target: Option<&str>) -> Result
79
79
80
80
// since https://github.com/rust-lang/rust/pull/51384, we can pass --extern-html-root-url to
81
81
// force rustdoc to link to other docs.rs docs for dependencies
82
- let source = try!( source_cfg_map. load ( & source_id) ) ;
82
+ let source = try!( source_cfg_map. load ( source_id) ) ;
83
83
for ( name, dep) in try!( resolve_deps ( & pkg, & config, source) ) {
84
84
rustdoc_args. push ( "--extern-html-root-url" . to_string ( ) ) ;
85
85
rustdoc_args. push ( format ! ( "{}=https://docs.rs/{}/{}" ,
@@ -118,7 +118,7 @@ pub fn build_doc(name: &str, vers: Option<&str>, target: Option<&str>) -> Result
118
118
119
119
let ws = try!( Workspace :: ephemeral ( pkg, & config, Some ( Filesystem :: new ( target_dir) ) , false ) ) ;
120
120
let exec: Arc < Executor > = Arc :: new ( DefaultExecutor ) ;
121
- let source = try!( source_cfg_map. load ( & source_id) ) ;
121
+ let source = try!( source_cfg_map. load ( source_id) ) ;
122
122
try!( ops:: compile_ws ( & ws, Some ( source) , & opts, & exec) ) ;
123
123
124
124
Ok ( try!( ws. current ( ) ) . clone ( ) )
@@ -139,9 +139,9 @@ fn resolve_deps<'cfg>(pkg: &Package, config: &'cfg Config, src: Box<Source + 'cf
139
139
None ,
140
140
false ,
141
141
) ) ;
142
- let dep_ids = resolver. deps ( pkg. package_id ( ) ) . map ( |p| p. 0 ) . cloned ( ) . collect :: < Vec < _ > > ( ) ;
142
+ let dep_ids = resolver. deps ( pkg. package_id ( ) ) . map ( |p| p. 0 ) . collect :: < Vec < _ > > ( ) ;
143
143
let pkg_set = try!( registry. get ( & dep_ids) ) ;
144
- let deps = try!( pkg_set. get_many ( & dep_ids) ) ;
144
+ let deps = try!( pkg_set. get_many ( dep_ids) ) ;
145
145
146
146
let mut ret = Vec :: new ( ) ;
147
147
for dep in deps {
@@ -161,11 +161,11 @@ pub fn get_package(name: &str, vers: Option<&str>) -> CargoResult<Package> {
161
161
let source_id = try!( SourceId :: crates_io ( & config) ) ;
162
162
163
163
let source_map = try!( SourceConfigMap :: new ( & config) ) ;
164
- let mut source = try!( source_map. load ( & source_id) ) ;
164
+ let mut source = try!( source_map. load ( source_id) ) ;
165
165
166
166
try!( source. update ( ) ) ;
167
167
168
- let dep = try!( Dependency :: parse_no_deprecated ( name, vers, & source_id) ) ;
168
+ let dep = try!( Dependency :: parse_no_deprecated ( name, vers, source_id) ) ;
169
169
let deps = try!( source. query_vec ( & dep) ) ;
170
170
let pkgid = try!( deps. iter ( ) . map ( |p| p. package_id ( ) ) . max ( )
171
171
// FIXME: This is probably not a rusty way to handle options and results
@@ -177,7 +177,7 @@ pub fn get_package(name: &str, vers: Option<&str>) -> CargoResult<Package> {
177
177
178
178
let pkg_set = try!( PackageSet :: new ( & [ pkgid. clone ( ) ] , source_map, & config) ) ;
179
179
180
- let pkg = try!( pkg_set. get_one ( & pkgid) ) . clone ( ) ;
180
+ let pkg = try!( pkg_set. get_one ( pkgid) ) . clone ( ) ;
181
181
182
182
Ok ( pkg)
183
183
}
@@ -189,7 +189,7 @@ pub fn update_sources() -> CargoResult<()> {
189
189
let source_id = try!( SourceId :: crates_io ( & config) ) ;
190
190
191
191
let source_map = try!( SourceConfigMap :: new ( & config) ) ;
192
- let mut source = try!( source_map. load ( & source_id) ) ;
192
+ let mut source = try!( source_map. load ( source_id) ) ;
193
193
194
194
source. update ( )
195
195
}
0 commit comments