Skip to content

Move MSRV to 1.71#2220

Merged
ctz merged 14 commits intomainfrom
jbp-msrv-1.71
Nov 20, 2024
Merged

Move MSRV to 1.71#2220
ctz merged 14 commits intomainfrom
jbp-msrv-1.71

Conversation

@ctz
Copy link
Copy Markdown
Member

@ctz ctz commented Nov 18, 2024

As discussed on discord.

Most of this PR is actually adopting the new let-else syntax; this could be a later PR if desired.

@rustls-benchmarking
Copy link
Copy Markdown

rustls-benchmarking bot commented Nov 18, 2024

Benchmark results

Instruction counts

Significant differences

There are no significant instruction count differences

Other differences

Click to expand
Scenario Baseline Candidate Diff Threshold
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha_server 10676890 10762481 85591 (0.80%) 0.81%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes_server 10454954 10410512 -44442 (-0.43%) 1.55%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_aes_client 8580889 8554046 -26843 (-0.31%) 1.06%
handshake_tickets_aws_lc_rs_1.2_rsa_aes_client 4216429 4222279 5850 (0.14%) 0.20%
handshake_tickets_aws_lc_rs_1.2_rsa_aes_server 5015924 5022704 6780 (0.14%) 0.20%
handshake_tickets_ring_1.2_rsa_aes_client 4498203 4503333 5130 (0.11%) 0.20%
handshake_session_id_aws_lc_rs_1.2_rsa_aes_server 3871863 3876243 4380 (0.11%) 0.20%
handshake_session_id_aws_lc_rs_1.2_rsa_aes_client 3873865 3878245 4380 (0.11%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes_client 3085124 3081794 -3330 (-0.11%) 0.21%
handshake_session_id_ring_1.2_rsa_aes_server 4230850 4235230 4380 (0.10%) 0.20%
handshake_tickets_ring_1.2_rsa_aes_server 4695390 4699770 4380 (0.09%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_client 8600502 8608294 7792 (0.09%) 0.74%
handshake_session_id_ring_1.2_rsa_aes_client 4237209 4240869 3660 (0.09%) 0.20%
transfer_no_resume_ring_1.2_rsa_aes_client 58236450 58271658 35208 (0.06%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_aes_client 58251817 58287020 35203 (0.06%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes_client 58254052 58289252 35200 (0.06%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes_client 58256133 58291330 35197 (0.06%) 0.20%
transfer_no_resume_ring_1.3_ecdsap256_aes_client 58341600 58376805 35205 (0.06%) 0.20%
transfer_no_resume_ring_1.3_ecdsap384_aes_client 58348749 58383947 35198 (0.06%) 0.20%
transfer_no_resume_ring_1.3_rsa_aes_client 58352502 58387702 35200 (0.06%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_client 3087260 3085424 -1836 (-0.06%) 0.25%
handshake_no_resume_ring_1.3_ecdsap256_aes_client 3623446 3621578 -1868 (-0.05%) 0.46%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes_client 68683804 68719005 35201 (0.05%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha_client 28190069 28202097 12028 (0.04%) 0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha_client 27800272 27812075 11803 (0.04%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes_client 27856299 27867857 11558 (0.04%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes_client 27853751 27865296 11545 (0.04%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha_client 28187035 28198643 11608 (0.04%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha_client 27795977 27807386 11409 (0.04%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes_client 28220767 28232309 11542 (0.04%) 0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_aes_client 27860698 27872080 11382 (0.04%) 0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_aes_client 28224645 28236173 11528 (0.04%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes_client 28217788 28229260 11472 (0.04%) 0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha_client 28194218 28205545 11327 (0.04%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha_client 27793756 27804906 11150 (0.04%) 0.20%
transfer_no_resume_ring_1.3_ecdsap256_chacha_client 92673769 92708968 35199 (0.04%) 0.20%
transfer_no_resume_ring_1.3_rsa_chacha_client 92684671 92719871 35200 (0.04%) 0.20%
transfer_no_resume_ring_1.3_ecdsap384_chacha_client 92682836 92718033 35197 (0.04%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_client 92712624 92747825 35201 (0.04%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha_client 92718857 92754051 35194 (0.04%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_client 92714860 92750052 35192 (0.04%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes_server 30415013 30424085 9072 (0.03%) 0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha_server 30368144 30377189 9045 (0.03%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes_server 30414695 30423725 9030 (0.03%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha_server 30371222 30380151 8929 (0.03%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha_server 30371649 30380462 8813 (0.03%) 0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_aes_server 30411889 30420627 8738 (0.03%) 0.20%
handshake_session_id_ring_1.3_ecdsap384_chacha_client 40191025 40202557 11532 (0.03%) 0.20%
handshake_session_id_ring_1.3_ecdsap256_chacha_client 40193982 40205498 11516 (0.03%) 0.20%
handshake_session_id_ring_1.3_rsa_chacha_client 40198033 40209543 11510 (0.03%) 0.20%
handshake_session_id_ring_1.3_ecdsap384_aes_client 40285413 40296945 11532 (0.03%) 0.20%
handshake_session_id_ring_1.3_ecdsap256_aes_client 40288362 40299878 11516 (0.03%) 0.20%
handshake_session_id_ring_1.3_rsa_aes_client 40292413 40303923 11510 (0.03%) 0.20%
handshake_tickets_ring_1.3_ecdsap384_chacha_client 40508525 40520067 11542 (0.03%) 0.20%
handshake_tickets_ring_1.3_ecdsap256_chacha_client 40511800 40523326 11526 (0.03%) 0.20%
handshake_tickets_ring_1.3_ecdsap384_aes_client 40582783 40594325 11542 (0.03%) 0.20%
handshake_tickets_ring_1.3_rsa_chacha_client 40515800 40527320 11520 (0.03%) 0.20%
handshake_tickets_ring_1.3_ecdsap256_aes_client 40586050 40597576 11526 (0.03%) 0.20%
handshake_tickets_ring_1.3_rsa_aes_client 40590050 40601570 11520 (0.03%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes_server 10720298 10717847 -2451 (-0.02%) 1.12%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes_client 1925848 1926249 401 (0.02%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha_client 1932569 1932970 401 (0.02%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_server 1181763 1181970 207 (0.02%) 0.20%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes_client 1717479 1717773 294 (0.02%) 0.20%
handshake_no_resume_ring_1.3_rsa_aes_client 2656185 2656577 392 (0.01%) 0.20%
handshake_no_resume_ring_1.3_rsa_chacha_client 2662050 2662442 392 (0.01%) 0.20%
handshake_no_resume_ring_1.3_ecdsap256_chacha_client 3624948 3625437 489 (0.01%) 0.48%
handshake_no_resume_ring_1.3_ecdsap256_aes_server 1612605 1612793 188 (0.01%) 1.07%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha_server 28887441 28890760 3319 (0.01%) 0.20%
handshake_no_resume_ring_1.2_rsa_aes_client 2563566 2563860 294 (0.01%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes_server 28966561 28969837 3276 (0.01%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_aes_server 2076551 2076785 234 (0.01%) 0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_aes_server 28963930 28967137 3207 (0.01%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha_server 28887554 28890746 3192 (0.01%) 0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha_server 28884840 28887815 2975 (0.01%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes_server 28966783 28969755 2972 (0.01%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_server 2079584 2079793 209 (0.01%) 0.20%
handshake_no_resume_ring_1.3_ecdsap256_chacha_server 1614006 1614162 156 (0.01%) 1.07%
handshake_session_id_ring_1.3_rsa_aes_server 41600228 41604068 3840 (0.01%) 0.20%
handshake_session_id_ring_1.3_ecdsap256_aes_server 41602821 41606661 3840 (0.01%) 0.20%
handshake_session_id_ring_1.3_ecdsap384_aes_server 41602899 41606739 3840 (0.01%) 0.20%
handshake_tickets_ring_1.3_rsa_aes_server 42061118 42064988 3870 (0.01%) 0.20%
handshake_tickets_ring_1.3_ecdsap256_aes_server 42064018 42067888 3870 (0.01%) 0.20%
handshake_tickets_ring_1.3_ecdsap384_aes_server 42064238 42068078 3840 (0.01%) 0.20%
handshake_session_id_ring_1.3_rsa_chacha_server 41481998 41485118 3120 (0.01%) 0.20%
handshake_session_id_ring_1.3_ecdsap256_chacha_server 41484591 41487711 3120 (0.01%) 0.20%
handshake_session_id_ring_1.3_ecdsap384_chacha_server 41484669 41487789 3120 (0.01%) 0.20%
handshake_tickets_ring_1.3_rsa_chacha_server 41962808 41965958 3150 (0.01%) 0.20%
handshake_tickets_ring_1.3_ecdsap256_chacha_server 41965708 41968858 3150 (0.01%) 0.20%
handshake_tickets_ring_1.3_ecdsap384_chacha_server 41965928 41969048 3120 (0.01%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes_server 1179570 1179620 50 (0.00%) 0.20%
handshake_no_resume_ring_1.3_ecdsap384_aes_server 7567067 7567226 159 (0.00%) 0.20%
handshake_no_resume_ring_1.2_rsa_aes_server 11292388 11292583 195 (0.00%) 0.20%
handshake_no_resume_ring_1.3_ecdsap384_chacha_server 7569262 7569366 104 (0.00%) 0.20%
handshake_no_resume_ring_1.3_rsa_aes_server 11425365 11425517 152 (0.00%) 0.20%
handshake_no_resume_ring_1.3_ecdsap384_aes_client 35183067 35183497 430 (0.00%) 0.20%
handshake_no_resume_ring_1.3_rsa_chacha_server 11431345 11431473 128 (0.00%) 0.20%
handshake_no_resume_ring_1.3_ecdsap384_chacha_client 35185039 35185385 346 (0.00%) 0.20%
transfer_no_resume_ring_1.2_rsa_aes_server 46389597 46389587 -10 (-0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha_server 80661859 80661842 -17 (-0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_server 80641261 80641253 -8 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap256_aes_server 46467805 46467808 3 (0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap384_aes_server 46470683 46470681 -2 (-0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes_server 46434711 46434712 1 (0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_aes_server 46467118 46467119 1 (0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes_server 46480090 46480089 -1 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_rsa_aes_server 46487102 46487101 -1 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_rsa_chacha_server 80554936 80554935 -1 (-0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_server 80648884 80648885 1 (0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap384_chacha_server 80540450 80540450 0 (0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes_server 46460144 46460144 0 (0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap256_chacha_server 80535649 80535649 0 (0.00%) 0.20%

Wall-time

Significant differences

⚠️ There are significant wall-time differences

Click to expand
Scenario Baseline Candidate Diff Threshold
handshake_no_resume_aws_lc_rs_1.3_rsa_aes 1.12 ms 1.09 ms ✅ -0.04 ms (-3.20%) 1.83%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes 1.09 ms 1.06 ms ✅ -0.03 ms (-3.18%) 1.68%
handshake_session_id_aws_lc_rs_1.2_rsa_aes 1.63 ms 1.60 ms ✅ -0.04 ms (-2.37%) 1.59%
handshake_session_id_aws_lc_rs_1.3_rsa_aes 5.01 ms 4.94 ms ✅ -0.06 ms (-1.29%) 1.26%
handshake_session_id_ring_1.2_rsa_aes 1.53 ms 1.52 ms ✅ -0.02 ms (-1.02%) 1.00%

Other differences

Click to expand
Scenario Baseline Candidate Diff Threshold
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha 1.12 ms 1.08 ms -0.04 ms (-3.57%) 3.96%
handshake_tickets_aws_lc_rs_1.2_rsa_aes 1.80 ms 1.76 ms -0.03 ms (-1.86%) 2.40%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha 4.98 ms 4.91 ms -0.07 ms (-1.46%) 1.91%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes 5.22 ms 5.15 ms -0.07 ms (-1.33%) 3.97%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes 5.19 ms 5.13 ms -0.06 ms (-1.17%) 4.54%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha 5.18 ms 5.12 ms -0.06 ms (-1.10%) 1.58%
handshake_tickets_ring_1.2_rsa_aes 1.61 ms 1.60 ms -0.02 ms (-1.07%) 1.20%
handshake_tickets_aws_lc_rs_1.3_rsa_aes 5.18 ms 5.13 ms -0.05 ms (-0.91%) 1.08%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes 461.42 µs 457.27 µs -4.14 µs (-0.90%) 3.05%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha 459.88 µs 456.15 µs -3.73 µs (-0.81%) 2.79%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes 4.33 ms 4.29 ms -0.03 ms (-0.76%) 1.51%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha 4.29 ms 4.26 ms -0.03 ms (-0.73%) 1.60%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes 5.05 ms 5.02 ms -0.03 ms (-0.58%) 1.26%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_aes 4.52 ms 4.50 ms -0.03 ms (-0.57%) 4.32%
handshake_no_resume_ring_1.3_ecdsap256_aes 507.10 µs 504.27 µs -2.83 µs (-0.56%) 2.62%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha 13.68 ms 13.61 ms -0.07 ms (-0.49%) 1.77%
handshake_no_resume_ring_1.3_ecdsap256_chacha 503.70 µs 501.30 µs -2.40 µs (-0.48%) 2.70%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha 5.00 ms 4.98 ms -0.02 ms (-0.46%) 1.44%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes 5.25 ms 5.23 ms -0.02 ms (-0.45%) 3.77%
handshake_session_id_ring_1.3_ecdsap256_aes 6.39 ms 6.36 ms -0.03 ms (-0.44%) 1.02%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha 4.48 ms 4.46 ms -0.02 ms (-0.42%) 1.89%
transfer_no_resume_ring_1.2_rsa_aes 6.83 ms 6.81 ms -0.03 ms (-0.42%) 2.60%
transfer_no_resume_ring_1.3_ecdsap256_aes 6.38 ms 6.35 ms -0.03 ms (-0.42%) 3.27%
handshake_tickets_ring_1.3_ecdsap256_aes 6.47 ms 6.44 ms -0.03 ms (-0.40%) 1.09%
transfer_no_resume_ring_1.3_rsa_aes 6.88 ms 6.85 ms -0.03 ms (-0.39%) 3.46%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes 4.51 ms 4.49 ms -0.02 ms (-0.38%) 1.30%
handshake_tickets_ring_1.3_ecdsap256_chacha 6.42 ms 6.40 ms -0.02 ms (-0.35%) 1.00%
transfer_no_resume_ring_1.3_ecdsap384_aes 9.52 ms 9.49 ms -0.03 ms (-0.34%) 2.11%
handshake_no_resume_ring_1.3_rsa_aes 997.50 µs 994.37 µs -3.13 µs (-0.31%) 1.02%
handshake_session_id_ring_1.3_rsa_aes 6.89 ms 6.87 ms -0.02 ms (-0.31%) 1.00%
handshake_no_resume_ring_1.3_rsa_chacha 997.92 µs 994.88 µs -3.05 µs (-0.31%) 1.21%
handshake_session_id_ring_1.3_ecdsap256_chacha 6.34 ms 6.32 ms -0.02 ms (-0.30%) 1.00%
handshake_tickets_ring_1.3_rsa_aes 6.96 ms 6.94 ms -0.02 ms (-0.30%) 1.00%
transfer_no_resume_ring_1.3_ecdsap256_chacha 13.02 ms 12.99 ms -0.03 ms (-0.23%) 1.47%
transfer_no_resume_ring_1.3_rsa_chacha 13.52 ms 13.49 ms -0.03 ms (-0.23%) 1.55%
handshake_no_resume_ring_1.2_rsa_aes 994.74 µs 992.59 µs -2.16 µs (-0.22%) 1.09%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes 5.22 ms 5.21 ms -0.01 ms (-0.21%) 1.14%
handshake_tickets_ring_1.3_rsa_chacha 6.91 ms 6.89 ms -0.01 ms (-0.20%) 1.00%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha 5.20 ms 5.19 ms -0.01 ms (-0.19%) 1.34%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha 12.99 ms 12.96 ms -0.02 ms (-0.17%) 1.69%
transfer_no_resume_ring_1.3_ecdsap384_chacha 16.12 ms 16.09 ms -0.03 ms (-0.17%) 1.23%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha 13.72 ms 13.70 ms -0.02 ms (-0.16%) 1.53%
handshake_tickets_ring_1.3_ecdsap384_aes 9.54 ms 9.53 ms -0.01 ms (-0.15%) 1.00%
handshake_session_id_ring_1.3_ecdsap384_aes 9.47 ms 9.46 ms -0.01 ms (-0.15%) 1.00%
handshake_tickets_ring_1.3_ecdsap384_chacha 9.50 ms 9.49 ms -0.01 ms (-0.12%) 1.00%
handshake_session_id_ring_1.3_ecdsap384_chacha 9.43 ms 9.41 ms -0.01 ms (-0.11%) 1.00%
handshake_session_id_ring_1.3_rsa_chacha 6.83 ms 6.82 ms -0.01 ms (-0.09%) 1.00%
handshake_no_resume_ring_1.3_ecdsap384_chacha 3.60 ms 3.60 ms -0.00 ms (-0.05%) 1.00%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha 1.18 ms 1.18 ms -0.00 ms (-0.04%) 1.00%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_aes 1.18 ms 1.18 ms 0.00 ms (0.04%) 1.30%
handshake_no_resume_ring_1.3_ecdsap384_aes 3.60 ms 3.60 ms -0.00 ms (-0.01%) 1.00%

Additional information

Historical results

Checkout details:

Copy link
Copy Markdown
Member

@djc djc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like a nice improvement!

Too bad GitHub syntax highlighting doesn't understand let-else...

@ctz ctz added this pull request to the merge queue Nov 20, 2024
Merged via the queue into main with commit d138a0c Nov 20, 2024
@ctz ctz deleted the jbp-msrv-1.71 branch November 20, 2024 16:18
@algesten
Copy link
Copy Markdown

With ureq (also the new ureq3 which is RC 2), I try to maintain a conservative MSRV. This change forces me to fall in line with 1.71, which is unfortunate since I had hoped to stay on 1.65 for now. I know I'm in a minority that considers MSRV bumps borderline breaking change in semver terms.

@djc
Copy link
Copy Markdown
Member

djc commented Nov 25, 2024

@algesten someone just opened #2239, let's collect all the discussion there?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants