@@ -18,23 +18,27 @@ pub async fn unroll_rollup(
1818 previous_master : & str ,
1919 rollup_pr_number : u32 ,
2020) -> 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})" )
2424 } ;
2525 let mapping = enqueue_unrolled_try_builds ( ci_client, rollup_merges, previous_master)
2626 . await ?
2727 . into_iter ( )
2828 . fold ( String :: new ( ) , |mut string, c| {
2929 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+ } ) ;
3438 write ! ( & mut string, "|#{pr}|{commit}|\n " , pr = c. original_pr_number) . unwrap ( ) ;
3539 string
3640 } ) ;
37- let previous_master = format_commit ( previous_master) ;
41+ let previous_master = format_commit ( previous_master, true ) ;
3842 let msg =
3943 format ! ( "📌 Perf builds for each rolled up PR:\n \n \
4044 |PR# | Perf Build Sha|\n |----|:-----:|\n \
0 commit comments