File tree Expand file tree Collapse file tree 2 files changed +4
-5
lines changed Expand file tree Collapse file tree 2 files changed +4
-5
lines changed Original file line number Diff line number Diff line change @@ -557,8 +557,7 @@ impl<'repo> CoreTemplatePropertyVar<'repo> for CommitTemplatePropertyKind<'repo>
557
557
Self :: RefSymbol ( property) => Some ( property. map ( |RefSymbolBuf ( s) | s) . into_dyn ( ) ) ,
558
558
Self :: RefSymbolOpt ( property) => Some (
559
559
property
560
- . try_unwrap ( "RefSymbol" )
561
- . map ( |RefSymbolBuf ( s) | s)
560
+ . map ( |opt| opt. map_or_else ( String :: new, |RefSymbolBuf ( s) | s) )
562
561
. into_dyn ( ) ,
563
562
) ,
564
563
_ => {
@@ -2827,9 +2826,7 @@ mod tests {
2827
2826
// string type were quoted/escaped. (e.g. `"foo".contains(bookmark)`)
2828
2827
insta:: assert_snapshot!( env. render_ok( "stringify(self)" , & sym( "a b" ) ) , @"a b" ) ;
2829
2828
insta:: assert_snapshot!( env. render_ok( "stringify(self)" , & Some ( sym( "a b" ) ) ) , @"a b" ) ;
2830
- insta:: assert_snapshot!(
2831
- env. render_ok( "stringify(self)" , & None :: <RefSymbolBuf >) ,
2832
- @"<Error: No RefSymbol available>" ) ;
2829
+ insta:: assert_snapshot!( env. render_ok( "stringify(self)" , & None :: <RefSymbolBuf >) , @"" ) ;
2833
2830
2834
2831
// string methods
2835
2832
insta:: assert_snapshot!( env. render_ok( "self.len()" , & sym( "a b" ) ) , @"3" ) ;
Original file line number Diff line number Diff line change @@ -3471,10 +3471,12 @@ mod tests {
3471
3471
#[ test]
3472
3472
fn test_stringify_function ( ) {
3473
3473
let mut env = TestTemplateEnv :: new ( ) ;
3474
+ env. add_keyword ( "none_i64" , || literal ( None :: < i64 > ) ) ;
3474
3475
env. add_color ( "error" , crossterm:: style:: Color :: DarkRed ) ;
3475
3476
3476
3477
insta:: assert_snapshot!( env. render_ok( "stringify(false)" ) , @"false" ) ;
3477
3478
insta:: assert_snapshot!( env. render_ok( "stringify(42).len()" ) , @"2" ) ;
3479
+ insta:: assert_snapshot!( env. render_ok( "stringify(none_i64)" ) , @"" ) ;
3478
3480
insta:: assert_snapshot!( env. render_ok( "stringify(label('error', 'text'))" ) , @"text" ) ;
3479
3481
}
3480
3482
You can’t perform that action at this time.
0 commit comments