@@ -1377,8 +1377,8 @@ pub fn diffCleanupEfficiency(
13771377) DiffError ! void {
13781378 var changes = false ;
13791379 // Stack of indices where equalities are found.
1380- var equalities = std .ArrayList (usize ). init ( allocator ) ;
1381- defer equalities .deinit ();
1380+ var equalities : std .ArrayListUnmanaged (usize ) = .empty ;
1381+ defer equalities .deinit (allocator );
13821382 // Always equal to equalities[equalitiesLength-1][1]
13831383 var last_equality : []const u8 = "" ;
13841384 var ipointer : isize = 0 ; // Index of current position.
@@ -1395,7 +1395,7 @@ pub fn diffCleanupEfficiency(
13951395 if (diffs .items [pointer ].operation == .equal ) { // Equality found.
13961396 if (diffs .items [pointer ].text .len < dmp .diff_edit_cost and (post_ins or post_del )) {
13971397 // Candidate found.
1398- try equalities .append (pointer );
1398+ try equalities .append (allocator , pointer );
13991399 pre_ins = post_ins ;
14001400 pre_del = post_del ;
14011401 last_equality = diffs .items [pointer ].text ;
@@ -1697,22 +1697,22 @@ test diffHalfMatch {
16971697test diffLinesToChars {
16981698 const allocator = testing .allocator ;
16991699 // Convert lines down to characters.
1700- var tmp_array_list = std .ArrayList ([]const u8 ). init ( allocator ) ;
1701- defer tmp_array_list .deinit ();
1702- try tmp_array_list .append ("" );
1703- try tmp_array_list .append ("alpha\n " );
1704- try tmp_array_list .append ("beta\n " );
1700+ var tmp_array_list : std .ArrayListUnmanaged ([]const u8 ) = .empty ;
1701+ defer tmp_array_list .deinit (allocator );
1702+ try tmp_array_list .append (allocator , "" );
1703+ try tmp_array_list .append (allocator , "alpha\n " );
1704+ try tmp_array_list .append (allocator , "beta\n " );
17051705
17061706 var result = try diffLinesToChars (allocator , "alpha\n beta\n alpha\n " , "beta\n alpha\n beta\n " );
17071707 try testing .expectEqualStrings ("\u{0001}\u{0002}\u{0001} " , result .chars_1 ); // Shared lines #1
17081708 try testing .expectEqualStrings ("\u{0002}\u{0001}\u{0002} " , result .chars_2 ); // Shared lines #2
17091709 try testing .expectEqualDeep (tmp_array_list .items , result .line_array .items ); // Shared lines #3
17101710
17111711 tmp_array_list .items .len = 0 ;
1712- try tmp_array_list .append ("" );
1713- try tmp_array_list .append ("alpha\r \n " );
1714- try tmp_array_list .append ("beta\r \n " );
1715- try tmp_array_list .append ("\r \n " );
1712+ try tmp_array_list .append (allocator , "" );
1713+ try tmp_array_list .append (allocator , "alpha\r \n " );
1714+ try tmp_array_list .append (allocator , "beta\r \n " );
1715+ try tmp_array_list .append (allocator , "\r \n " );
17161716 result .deinit (allocator );
17171717
17181718 result = try diffLinesToChars (allocator , "" , "alpha\r \n beta\r \n \r \n \r \n " );
@@ -1721,9 +1721,9 @@ test diffLinesToChars {
17211721 try testing .expectEqualDeep (tmp_array_list .items , result .line_array .items ); // Empty string and blank lines #3
17221722
17231723 tmp_array_list .items .len = 0 ;
1724- try tmp_array_list .append ("" );
1725- try tmp_array_list .append ("a" );
1726- try tmp_array_list .append ("b" );
1724+ try tmp_array_list .append (allocator , "" );
1725+ try tmp_array_list .append (allocator , "a" );
1726+ try tmp_array_list .append (allocator , "b" );
17271727 result .deinit (allocator );
17281728
17291729 result = try diffLinesToChars (allocator , "a" , "b" );
@@ -1744,20 +1744,20 @@ test diffLinesToChars {
17441744 const n : u8 = 255 ;
17451745 tmp_array_list .items .len = 0 ;
17461746
1747- var line_list = std .ArrayList (u8 ). init ( allocator ) ;
1748- defer line_list .deinit ();
1749- var char_list = std .ArrayList (u8 ). init ( allocator ) ;
1750- defer char_list .deinit ();
1747+ var line_list : std .ArrayListUnmanaged (u8 ) = .empty ;
1748+ defer line_list .deinit (allocator );
1749+ var char_list : std .ArrayListUnmanaged (u8 ) = .empty ;
1750+ defer char_list .deinit (allocator );
17511751
17521752 var i : u8 = 1 ;
17531753 while (i < n ) : (i += 1 ) {
1754- try tmp_array_list .append (&.{ i , '\n ' });
1755- try line_list .appendSlice (&.{ i , '\n ' });
1756- try char_list .append (i );
1754+ try tmp_array_list .append (allocator , &.{ i , '\n ' });
1755+ try line_list .appendSlice (allocator , &.{ i , '\n ' });
1756+ try char_list .append (allocator , i );
17571757 }
17581758 try testing .expectEqual (@as (usize , n - 1 ), tmp_array_list .items .len ); // Test initialization fail #1
17591759 try testing .expectEqual (@as (usize , n - 1 ), char_list .items .len ); // Test initialization fail #2
1760- try tmp_array_list .insert (0 , "" );
1760+ try tmp_array_list .insert (allocator , 0 , "" );
17611761 result = try diffLinesToChars (allocator , line_list .items , "" );
17621762 defer result .deinit (allocator );
17631763 // TODO: This isn't equal, should it be?
0 commit comments