@@ -18,23 +18,27 @@ pub async fn unroll_rollup(
18
18
previous_master : & str ,
19
19
rollup_pr_number : u32 ,
20
20
) -> Result < ( ) , String > {
21
- let format_commit = |s : & str | {
22
- let ( short , _ ) = s. split_at ( 8 ) ;
23
- format ! ( "[{short }](https://github.com/rust-lang-ci/rust/commit/{s})" )
21
+ let format_commit = |s : & str , truncate : bool | {
22
+ let display = truncate . then ( || s. split_at ( 10 ) . 0 ) . unwrap_or ( s ) ;
23
+ format ! ( "[{display }](https://github.com/rust-lang-ci/rust/commit/{s})" )
24
24
} ;
25
25
let mapping = enqueue_unrolled_try_builds ( ci_client, rollup_merges, previous_master)
26
26
. await ?
27
27
. into_iter ( )
28
28
. fold ( String :: new ( ) , |mut string, c| {
29
29
use std:: fmt:: Write ;
30
- let commit = c. sha . as_deref ( ) . map ( format_commit) . unwrap_or_else ( || {
31
- let head = format_commit ( & c. rolled_up_head ) ;
32
- format ! ( "❌ conflicts merging '{head}' into previous master ❌" )
33
- } ) ;
30
+ let commit = c
31
+ . sha
32
+ . as_deref ( )
33
+ . map ( |s| format_commit ( s, false ) )
34
+ . unwrap_or_else ( || {
35
+ let head = format_commit ( & c. rolled_up_head , true ) ;
36
+ format ! ( "❌ conflicts merging '{head}' into previous master ❌" )
37
+ } ) ;
34
38
write ! ( & mut string, "|#{pr}|{commit}|\n " , pr = c. original_pr_number) . unwrap ( ) ;
35
39
string
36
40
} ) ;
37
- let previous_master = format_commit ( previous_master) ;
41
+ let previous_master = format_commit ( previous_master, true ) ;
38
42
let msg =
39
43
format ! ( "📌 Perf builds for each rolled up PR:\n \n \
40
44
|PR# | Perf Build Sha|\n |----|:-----:|\n \
0 commit comments