File tree Expand file tree Collapse file tree 3 files changed +25
-36
lines changed Expand file tree Collapse file tree 3 files changed +25
-36
lines changed Original file line number Diff line number Diff line change @@ -198,28 +198,23 @@ fn cache_dir() -> PathBuf {
198
198
fn get_headers < U : IntoUrl > ( url : U ) -> HeaderMap {
199
199
let mut headers = HeaderMap :: new ( ) ;
200
200
let url = url. into_url ( ) . unwrap ( ) ;
201
+ let mut set_headers = |token : & str | {
202
+ headers. insert (
203
+ "authorization" ,
204
+ HeaderValue :: from_str ( format ! ( "token {token}" ) . as_str ( ) ) . unwrap ( ) ,
205
+ ) ;
206
+ headers. insert (
207
+ "x-github-api-version" ,
208
+ HeaderValue :: from_static ( "2022-11-28" ) ,
209
+ ) ;
210
+ } ;
211
+
201
212
if url. host_str ( ) == Some ( "api.github.com" ) {
202
213
if let Some ( token) = env:: GITHUB_TOKEN . as_ref ( ) {
203
- headers. insert (
204
- "authorization" ,
205
- HeaderValue :: from_str ( format ! ( "token {token}" ) . as_str ( ) ) . unwrap ( ) ,
206
- ) ;
207
- headers. insert (
208
- "x-github-api-version" ,
209
- HeaderValue :: from_static ( "2022-11-28" ) ,
210
- ) ;
211
- }
212
- } else {
213
- if let Some ( token) = env:: MISE_GITHUB_ENTERPRISE_TOKEN . as_ref ( ) {
214
- headers. insert (
215
- "authorization" ,
216
- HeaderValue :: from_str ( format ! ( "token {token}" ) . as_str ( ) ) . unwrap ( ) ,
217
- ) ;
218
- headers. insert (
219
- "x-github-api-version" ,
220
- HeaderValue :: from_static ( "2022-11-28" ) ,
221
- ) ;
214
+ set_headers ( token) ;
222
215
}
216
+ } else if let Some ( token) = env:: MISE_GITHUB_ENTERPRISE_TOKEN . as_ref ( ) {
217
+ set_headers ( token) ;
223
218
}
224
219
225
220
headers
Original file line number Diff line number Diff line change @@ -225,20 +225,18 @@ fn cache_dir() -> PathBuf {
225
225
fn get_headers < U : IntoUrl > ( url : U ) -> HeaderMap {
226
226
let mut headers = HeaderMap :: new ( ) ;
227
227
let url = url. into_url ( ) . unwrap ( ) ;
228
+ let mut set_headers = |token : & str | {
229
+ headers. insert (
230
+ "Authorization" ,
231
+ HeaderValue :: from_str ( format ! ( "Bearer {token}" ) . as_str ( ) ) . unwrap ( ) ,
232
+ ) ;
233
+ } ;
228
234
if url. host_str ( ) == Some ( "gitlab.com" ) {
229
235
if let Some ( token) = env:: GITLAB_TOKEN . as_ref ( ) {
230
- headers. insert (
231
- "Authorization" ,
232
- HeaderValue :: from_str ( format ! ( "Bearer {token}" ) . as_str ( ) ) . unwrap ( ) ,
233
- ) ;
234
- }
235
- } else {
236
- if let Some ( token) = env:: MISE_GITLAB_ENTERPRISE_TOKEN . as_ref ( ) {
237
- headers. insert (
238
- "Authorization" ,
239
- HeaderValue :: from_str ( format ! ( "Bearer {token}" ) . as_str ( ) ) . unwrap ( ) ,
240
- ) ;
236
+ set_headers ( token) ;
241
237
}
238
+ } else if let Some ( token) = env:: MISE_GITLAB_ENTERPRISE_TOKEN . as_ref ( ) {
239
+ set_headers ( token) ;
242
240
}
243
241
headers
244
242
}
Original file line number Diff line number Diff line change @@ -70,9 +70,7 @@ impl Client {
70
70
let get = |url : Url | async move {
71
71
debug ! ( "GET {}" , & url) ;
72
72
let mut req = self . reqwest . get ( url. clone ( ) ) ;
73
- for ( key, value) in headers. iter ( ) {
74
- req = req. header ( key, value) ;
75
- }
73
+ req = req. headers ( headers. clone ( ) ) ;
76
74
let resp = req. send ( ) . await ?;
77
75
debug ! ( "GET {url} {}" , resp. status( ) ) ;
78
76
display_github_rate_limit ( & resp) ;
@@ -113,9 +111,7 @@ impl Client {
113
111
let head = |url : Url | async move {
114
112
debug ! ( "HEAD {}" , & url) ;
115
113
let mut req = self . reqwest . head ( url. clone ( ) ) ;
116
- for ( key, value) in headers. iter ( ) {
117
- req = req. header ( key, value) ;
118
- }
114
+ req = req. headers ( headers. clone ( ) ) ;
119
115
let resp = req. send ( ) . await ?;
120
116
debug ! ( "HEAD {url} {}" , resp. status( ) ) ;
121
117
display_github_rate_limit ( & resp) ;
You can’t perform that action at this time.
0 commit comments