@@ -160,6 +160,8 @@ fn get_readme(
160
160
version : & Version ,
161
161
krate_name : & str ,
162
162
) -> Option < String > {
163
+ let pkg_name = format ! ( "{}-{}" , krate_name, version. num) ;
164
+
163
165
let location = uploader. crate_location ( krate_name, & version. num . to_string ( ) ) ;
164
166
165
167
let location = match uploader {
@@ -175,46 +177,36 @@ fn get_readme(
175
177
let response = match client. get ( & location) . headers ( extra_headers) . send ( ) {
176
178
Ok ( r) => r,
177
179
Err ( err) => {
178
- println ! (
179
- "[{}-{}] Unable to fetch crate: {}" ,
180
- krate_name, version. num, err
181
- ) ;
180
+ println ! ( "[{}] Unable to fetch crate: {}" , pkg_name, err) ;
182
181
return None ;
183
182
}
184
183
} ;
185
184
186
185
if !response. status ( ) . is_success ( ) {
187
186
println ! (
188
- "[{}-{}] Failed to get a 200 response: {}" ,
189
- krate_name,
190
- version. num,
187
+ "[{}] Failed to get a 200 response: {}" ,
188
+ pkg_name,
191
189
response. text( ) . unwrap( )
192
190
) ;
193
191
return None ;
194
192
}
195
193
196
194
let reader = GzDecoder :: new ( response) ;
197
195
let mut archive = Archive :: new ( reader) ;
198
- let mut entries = archive. entries ( ) . unwrap_or_else ( |_| {
199
- panic ! (
200
- "[{}-{}] Invalid tar archive entries" ,
201
- krate_name, version. num
202
- )
203
- } ) ;
196
+ let mut entries = archive
197
+ . entries ( )
198
+ . unwrap_or_else ( |_| panic ! ( "[{}] Invalid tar archive entries" , pkg_name) ) ;
199
+
204
200
let manifest: Manifest = {
205
- let path = format ! ( "{}-{} /Cargo.toml" , krate_name , version . num ) ;
201
+ let path = format ! ( "{}/Cargo.toml" , pkg_name ) ;
206
202
let contents = find_file_by_path ( & mut entries, Path :: new ( & path) , version, krate_name) ;
207
- toml:: from_str ( & contents) . unwrap_or_else ( |_| {
208
- panic ! (
209
- "[{}-{}] Syntax error in manifest file" ,
210
- krate_name, version. num
211
- )
212
- } )
203
+ toml:: from_str ( & contents)
204
+ . unwrap_or_else ( |_| panic ! ( "[{}] Syntax error in manifest file" , pkg_name) )
213
205
} ;
214
206
215
207
let rendered = {
216
208
let readme_path = manifest. package . readme . as_ref ( ) ?;
217
- let path = format ! ( "{}-{} /{}" , krate_name , version . num , readme_path) ;
209
+ let path = format ! ( "{}/{}" , pkg_name , readme_path) ;
218
210
let contents = find_file_by_path ( & mut entries, Path :: new ( & path) , version, krate_name) ;
219
211
text_to_html (
220
212
& contents,
0 commit comments