@@ -208,15 +208,9 @@ impl SiteCtxt {
208
208
/// Returns the not yet tested commits
209
209
pub async fn missing_commits ( & self ) -> Vec < ( Commit , MissingReason ) > {
210
210
let conn = self . conn ( ) . await ;
211
- let ( master_commits, queued_pr_commits, in_progress_artifacts) = futures:: join!(
212
- collector:: master_commits( ) ,
213
- conn. queued_commits( ) ,
214
- conn. in_progress_artifacts( )
215
- ) ;
216
- let master_commits = master_commits
217
- . map_err ( |e| anyhow:: anyhow!( "{:?}" , e) )
218
- . context ( "getting master commit list" )
219
- . unwrap ( ) ;
211
+ let ( queued_pr_commits, in_progress_artifacts) =
212
+ futures:: join!( conn. queued_commits( ) , conn. in_progress_artifacts( ) ) ;
213
+ let master_commits = & self . master_commits . load ( ) . commits ;
220
214
221
215
let index = self . index . load ( ) ;
222
216
let all_commits = index
@@ -226,14 +220,14 @@ impl SiteCtxt {
226
220
. collect :: < HashSet < _ > > ( ) ;
227
221
228
222
calculate_missing (
229
- master_commits,
223
+ master_commits. clone ( ) ,
230
224
queued_pr_commits,
231
225
in_progress_artifacts,
232
226
all_commits,
233
227
)
234
228
}
235
229
236
- /// Get cached master-branch Rust commits.
230
+ /// Get cached master-branch Rust commits.
237
231
/// Returns cached results immediately, but if the cached value is older than one minute,
238
232
/// updates in a background task for next time.
239
233
pub fn get_master_commits ( & self ) -> Guard < Arc < MasterCommitCache > > {
0 commit comments