Skip to content

keep Cargo.toml and Cargo.lock in sync#837

Merged
HaoboGu merged 1 commit into
HaoboGu:mainfrom
scottlamb:update-lockfile
May 10, 2026
Merged

keep Cargo.toml and Cargo.lock in sync#837
HaoboGu merged 1 commit into
HaoboGu:mainfrom
scottlamb:update-lockfile

Conversation

@scottlamb
Copy link
Copy Markdown
Contributor

My language server keeps running cargo check-like commands and causing whatever lockfiles it hits to be updated. So it's hard to prepare clean changes when starting from out-of-sync lockfiles.

So add a script that updates them all (conveniently, cargo fetch doesn't even need the target toolchain) and enforces it on CI.

Most (possibly all) of the lockfile updates in this change are to match a885a16f.

@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 9, 2026

Size Report

Example main PR Diff .text .data .bss
use_config/nrf52832_ble 356.2 KiB 356.2 KiB +0.00% 0 0 0
use_config/nrf52840_ble 406.3 KiB 406.3 KiB +0.00% ⬆️ +4 0 0
use_config/nrf52840_ble_split (central) 482.2 KiB 482.2 KiB +0.00% ⬆️ +4 0 0
use_config/nrf52840_ble_split (peripheral) 307.2 KiB 307.2 KiB +0.00% ⬇️ -4 0 0
use_config/pi_pico_w_ble 640.2 KiB 640.2 KiB +0.00% ⬆️ +12 0 0
use_config/rp2040 146.7 KiB 146.7 KiB +0.00% 0 0 0
use_config/rp2040_split (central) 158.4 KiB 158.4 KiB +0.00% ⬇️ -4 0 0
use_config/rp2040_split (peripheral) 25.9 KiB 25.9 KiB -0.01% ⬇️ -4 0 0
use_config/stm32f1 62.3 KiB 62.3 KiB +0.00% 0 0 0
use_config/stm32h7 99.7 KiB 99.7 KiB +0.00% 0 0 0
use_rust/nrf52832_ble 345.3 KiB 345.3 KiB +0.00% ⬇️ -8 0 0
use_rust/nrf52840_ble 401.6 KiB 401.5 KiB +0.00% ⬇️ -12 0 0
use_rust/nrf52840_ble_split (central) 490.5 KiB 490.5 KiB +0.00% 0 0 0
use_rust/nrf52840_ble_split (peripheral) 304.5 KiB 304.5 KiB +0.00% ⬇️ -4 0 0
use_rust/pi_pico_w_ble 640.8 KiB 640.8 KiB +0.00% ⬆️ +4 0 0
use_rust/rp2040 146.4 KiB 146.4 KiB +0.00% ⬆️ +4 0 0
use_rust/rp2040_split (central) 157.7 KiB 157.7 KiB +0.00% ⬆️ +4 0 0
use_rust/rp2040_split (peripheral) 26.4 KiB 26.4 KiB +0.00% 0 0 0
use_rust/stm32f1 61.8 KiB 61.8 KiB +0.00% ⬇️ -4 0 0
use_rust/stm32h7 120.8 KiB 120.8 KiB +0.00% ⬆️ +8 0 0
use_config/nrf52832_ble — 356.2 KiB → 356.2 KiB (+0.00%)

cargo size (PR):

   text	   data	    bss	    dec	    hex	filename
 326056	   5192	  33464	 364712	  590a8	rmk-nrf52832

cargo size (main):

   text	   data	    bss	    dec	    hex	filename
 326056	   5192	  33464	 364712	  590a8	rmk-nrf52832

Bloaty diff (PR vs main):

    FILE SIZE        VM SIZE    
 --------------  -------------- 
  +0.1% +2.52Ki  [ = ]       0    .debug_info
  +0.2% +1.03Ki  [ = ]       0    .debug_loc
  +0.1%    +230  [ = ]       0    .debug_line
  +0.2%     +17  [ = ]       0    .debug_abbrev
  -1.5%      -1  [ = ]       0    [Unmapped]
  -0.0%      -8  [ = ]       0    .debug_aranges
  -0.0%     -20  [ = ]       0    .debug_frame
  -0.0%     -25  [ = ]       0    .strtab
  -0.0%     -32  [ = ]       0    .debug_ranges
  -0.0%     -32  [ = ]       0    .symtab
  -0.0%    -427  [ = ]       0    .debug_str
  +0.1% +3.27Ki  [ = ]       0    TOTAL
use_config/nrf52840_ble — 406.3 KiB → 406.3 KiB (+0.00% ⬆️)

cargo size (PR):

   text	   data	    bss	    dec	    hex	filename
 360616	   5200	  50248	 416064	  65940	rmk-nrf52840

cargo size (main):

   text	   data	    bss	    dec	    hex	filename
 360612	   5200	  50248	 416060	  6593c	rmk-nrf52840

Bloaty diff (PR vs main):

    FILE SIZE        VM SIZE    
 --------------  -------------- 
  +0.0%    +153  [ = ]       0    .debug_line
  +0.0%    +123  [ = ]       0    .debug_str
  +0.0%     +66  [ = ]       0    .debug_info
  +0.0%      +4  +0.0%      +4    .text
  -9.8%      -6  [ = ]       0    [Unmapped]
  +0.0%    +340  +0.0%      +4    TOTAL
use_config/nrf52840_ble_split (central) — 482.2 KiB → 482.2 KiB (+0.00% ⬆️)

cargo size (PR):

   text	   data	    bss	    dec	    hex	filename
 441164	   6524	  46056	 493744	  788b0	central

cargo size (main):

   text	   data	    bss	    dec	    hex	filename
 441160	   6524	  46056	 493740	  788ac	central

Bloaty diff (PR vs main):

    FILE SIZE        VM SIZE    
 --------------  -------------- 
   +60%     +27  [ = ]       0    [Unmapped]
  +0.0%      +4  +0.0%      +4    .text
  -0.0%     -22  [ = ]       0    .debug_loc
  -0.0%    -141  [ = ]       0    .debug_line
  -0.0%    -363  [ = ]       0    .debug_info
  -0.0%    -857  [ = ]       0    .debug_str
  -0.0% -1.32Ki  +0.0%      +4    TOTAL
use_config/nrf52840_ble_split (peripheral) — 307.2 KiB → 307.2 KiB (+0.00% ⬇️)

cargo size (PR):

   text	   data	    bss	    dec	    hex	filename
 282128	   5888	  26520	 314536	  4cca8	peripheral

cargo size (main):

   text	   data	    bss	    dec	    hex	filename
 282132	   5888	  26520	 314540	  4ccac	peripheral

Bloaty diff (PR vs main):

    FILE SIZE        VM SIZE    
 --------------  -------------- 
  +0.0%     +64  [ = ]       0    .debug_info
  +0.0%     +10  [ = ]       0    .debug_loc
  +5.0%      +3  [ = ]       0    [Unmapped]
  -0.0%      -2  [ = ]       0    .debug_line
  -0.0%      -4  -0.0%      -4    .text
  -0.0%    -167  [ = ]       0    .debug_str
  -0.0%     -96  -0.0%      -4    TOTAL
use_config/pi_pico_w_ble — 640.2 KiB → 640.2 KiB (+0.00% ⬆️)

cargo size (PR):

   text	   data	    bss	    dec	    hex	filename
 600944	      0	  54632	 655576	  a00d8	rmk-pi-pico-w

cargo size (main):

   text	   data	    bss	    dec	    hex	filename
 600932	      0	  54632	 655564	  a00cc	rmk-pi-pico-w

Bloaty diff (PR vs main):

    FILE SIZE        VM SIZE    
 --------------  -------------- 
  +0.1% +1.76Ki  [ = ]       0    .debug_str
   +47%     +20  [ = ]       0    [Unmapped]
  +0.0%     +12  +0.0%     +12    .text
  -0.0%     -20  [ = ]       0    .debug_line
  -0.0%    -366  [ = ]       0    .debug_info
  +0.0% +1.41Ki  +0.0%     +12    TOTAL
use_config/rp2040 — 146.7 KiB → 146.7 KiB (+0.00%)

cargo size (PR):

   text	   data	    bss	    dec	    hex	filename
 134928	      0	  15244	 150172	  24a9c	rmk-rp2040

cargo size (main):

   text	   data	    bss	    dec	    hex	filename
 134928	      0	  15244	 150172	  24a9c	rmk-rp2040

Bloaty diff (PR vs main):

    FILE SIZE        VM SIZE    
 --------------  -------------- 
  +0.0%     +35  [ = ]       0    .debug_line
  -0.0%     -20  [ = ]       0    .debug_loc
  -0.0%    -196  [ = ]       0    .debug_info
  -0.0%    -459  [ = ]       0    .debug_str
  -0.0%    -640  [ = ]       0    TOTAL
use_config/rp2040_split (central) — 158.4 KiB → 158.4 KiB (+0.00% ⬇️)

cargo size (PR):

   text	   data	    bss	    dec	    hex	filename
 146156	      0	  16008	 162164	  27974	central

cargo size (main):

   text	   data	    bss	    dec	    hex	filename
 146160	      0	  16008	 162168	  27978	central

Bloaty diff (PR vs main):

    FILE SIZE        VM SIZE    
 --------------  -------------- 
  +0.0%    +258  [ = ]       0    .debug_info
  +0.1%    +123  [ = ]       0    .debug_line
  +0.0%     +42  [ = ]       0    .debug_loc
  -0.0%      -4  -0.0%      -4    .text
 -42.9%     -27  [ = ]       0    [Unmapped]
  -0.0%     -56  [ = ]       0    .debug_str
  +0.0%    +336  -0.0%      -4    TOTAL
use_config/rp2040_split (peripheral) — 25.9 KiB → 25.9 KiB (-0.01% ⬇️)

cargo size (PR):

   text	   data	    bss	    dec	    hex	filename
  24016	     56	   2412	  26484	   6774	peripheral

cargo size (main):

   text	   data	    bss	    dec	    hex	filename
  24020	     56	   2412	  26488	   6778	peripheral

Bloaty diff (PR vs main):

    FILE SIZE        VM SIZE    
 --------------  -------------- 
   +11%      +4  [ = ]       0    [Unmapped]
  -0.1%      -4  -0.1%      -4    .rodata
  [ = ]       0  -0.0%      -4    TOTAL
use_config/stm32f1 — 62.3 KiB → 62.3 KiB (+0.00%)

cargo size (PR):

   text	   data	    bss	    dec	    hex	filename
  56312	     28	   7432	  63772	   f91c	rmk-stm32f1

cargo size (main):

   text	   data	    bss	    dec	    hex	filename
  56312	     28	   7432	  63772	   f91c	rmk-stm32f1

Bloaty diff (PR vs main):

    FILE SIZE        VM SIZE    
 --------------  -------------- 
  +1.7%      +1  [ = ]       0    [Unmapped]
  -0.0%      -7  [ = ]       0    .debug_line
  -0.0%    -121  [ = ]       0    .debug_info
  -0.1%    -441  [ = ]       0    .debug_str
  -0.0%    -568  [ = ]       0    TOTAL
use_config/stm32h7 — 99.7 KiB → 99.7 KiB (+0.00%)

cargo size (PR):

   text	   data	    bss	    dec	    hex	filename
  92116	    268	   9664	 102048	  18ea0	rmk-stm32h7

cargo size (main):

   text	   data	    bss	    dec	    hex	filename
  92116	    268	   9664	 102048	  18ea0	rmk-stm32h7

Bloaty diff (PR vs main):

    FILE SIZE        VM SIZE    
 --------------  -------------- 
  +0.0%    +312  [ = ]       0    .debug_str
  +0.0%      +1  [ = ]       0    .debug_line
  -2.0%      -1  [ = ]       0    [Unmapped]
  +0.0%    +312  [ = ]       0    TOTAL
use_rust/nrf52832_ble — 345.3 KiB → 345.3 KiB (+0.00% ⬇️)

cargo size (PR):

   text	   data	    bss	    dec	    hex	filename
 315944	   5200	  32456	 353600	  56540	rmk-nrf52832

cargo size (main):

   text	   data	    bss	    dec	    hex	filename
 315952	   5200	  32456	 353608	  56548	rmk-nrf52832

Bloaty diff (PR vs main):

    FILE SIZE        VM SIZE    
 --------------  -------------- 
  +0.1% +2.41Ki  [ = ]       0    .debug_info
  +0.2% +1.07Ki  [ = ]       0    .debug_loc
  +0.1%    +252  [ = ]       0    .debug_line
  +9.8%      +5  [ = ]       0    [Unmapped]
  -0.0%      -8  [ = ]       0    .debug_aranges
  -0.0%      -8  -0.0%      -8    .text
  -0.0%     -16  [ = ]       0    .debug_ranges
  -0.1%     -20  [ = ]       0    .debug_frame
  -0.0%     -25  [ = ]       0    .strtab
  -0.0%     -32  [ = ]       0    .symtab
  -0.0%    -850  [ = ]       0    .debug_str
  +0.0% +2.80Ki  -0.0%      -8    TOTAL
use_rust/nrf52840_ble — 401.6 KiB → 401.5 KiB (+0.00% ⬇️)

cargo size (PR):

   text	   data	    bss	    dec	    hex	filename
 360256	   5200	  45728	 411184	  64630	rmk-nrf52840

cargo size (main):

   text	   data	    bss	    dec	    hex	filename
 360268	   5200	  45728	 411196	  6463c	rmk-nrf52840

Bloaty diff (PR vs main):

    FILE SIZE        VM SIZE    
 --------------  -------------- 
  +0.1% +2.45Ki  [ = ]       0    .debug_info
  +0.2% +1.02Ki  [ = ]       0    .debug_loc
  +0.0%    +406  [ = ]       0    .debug_str
  +0.1%    +236  [ = ]       0    .debug_line
   +24%     +13  [ = ]       0    [Unmapped]
  -0.0%      -8  [ = ]       0    .debug_aranges
  -0.0%     -12  -0.0%     -12    .text
  -0.0%     -20  [ = ]       0    .debug_frame
  -0.0%     -25  [ = ]       0    .strtab
  -0.0%     -32  [ = ]       0    .debug_ranges
  -0.0%     -32  [ = ]       0    .symtab
  +0.1% +3.99Ki  -0.0%     -12    TOTAL
use_rust/nrf52840_ble_split (central) — 490.5 KiB → 490.5 KiB (+0.00%)

cargo size (PR):

   text	   data	    bss	    dec	    hex	filename
 443984	   6524	  51792	 502300	  7aa1c	central

cargo size (main):

   text	   data	    bss	    dec	    hex	filename
 443984	   6524	  51792	 502300	  7aa1c	central

Bloaty diff (PR vs main):

    FILE SIZE        VM SIZE    
 --------------  -------------- 
  +0.1% +2.42Ki  [ = ]       0    .debug_info
  +0.0% +1.23Ki  [ = ]       0    .debug_str
  +0.1% +1.03Ki  [ = ]       0    .debug_loc
  +0.1%    +231  [ = ]       0    .debug_line
  -6.9%      -5  [ = ]       0    [Unmapped]
  -0.0%      -8  [ = ]       0    .debug_aranges
  -0.0%     -20  [ = ]       0    .debug_frame
  -0.0%     -25  [ = ]       0    .strtab
  -0.0%     -32  [ = ]       0    .debug_ranges
  -0.0%     -32  [ = ]       0    .symtab
  +0.1% +4.79Ki  [ = ]       0    TOTAL
use_rust/nrf52840_ble_split (peripheral) — 304.5 KiB → 304.5 KiB (+0.00% ⬇️)

cargo size (PR):

   text	   data	    bss	    dec	    hex	filename
 281148	   5328	  25288	 311764	  4c1d4	peripheral

cargo size (main):

   text	   data	    bss	    dec	    hex	filename
 281152	   5328	  25288	 311768	  4c1d8	peripheral

Bloaty diff (PR vs main):

    FILE SIZE        VM SIZE    
 --------------  -------------- 
  +0.0%    +144  [ = ]       0    .debug_str
 +10.0%      +6  [ = ]       0    [Unmapped]
  -0.0%      -4  -0.0%      -4    .text
  -0.0%     -90  [ = ]       0    .debug_info
  +0.0%     +56  -0.0%      -4    TOTAL
use_rust/pi_pico_w_ble — 640.8 KiB → 640.8 KiB (+0.00% ⬆️)

cargo size (PR):

   text	   data	    bss	    dec	    hex	filename
 601380	      0	  54776	 656156	  a031c	rmk-pi-pico-w

cargo size (main):

   text	   data	    bss	    dec	    hex	filename
 601376	      0	  54776	 656152	  a0318	rmk-pi-pico-w

Bloaty diff (PR vs main):

    FILE SIZE        VM SIZE    
 --------------  -------------- 
  +0.0%    +832  [ = ]       0    .debug_str
  +0.0%      +4  +0.0%      +4    .text
  -9.4%      -5  [ = ]       0    [Unmapped]
  -0.0%     -36  [ = ]       0    .debug_line
  -0.0%    -467  [ = ]       0    .debug_info
  +0.0%    +328  +0.0%      +4    TOTAL
use_rust/rp2040 — 146.4 KiB → 146.4 KiB (+0.00% ⬆️)

cargo size (PR):

   text	   data	    bss	    dec	    hex	filename
 134800	      0	  15124	 149924	  249a4	rmk-rp2040

cargo size (main):

   text	   data	    bss	    dec	    hex	filename
 134796	      0	  15124	 149920	  249a0	rmk-rp2040

Bloaty diff (PR vs main):

    FILE SIZE        VM SIZE    
 --------------  -------------- 
   +80%     +28  [ = ]       0    [Unmapped]
  +0.0%     +25  [ = ]       0    .debug_line
  +0.0%      +4  +0.0%      +4    .text
  -0.0%     -32  [ = ]       0    .debug_loc
  -0.0%    -196  [ = ]       0    .debug_info
  -0.0%    -477  [ = ]       0    .debug_str
  -0.0%    -648  +0.0%      +4    TOTAL
use_rust/rp2040_split (central) — 157.7 KiB → 157.7 KiB (+0.00% ⬆️)

cargo size (PR):

   text	   data	    bss	    dec	    hex	filename
 145656	      0	  15788	 161444	  276a4	central

cargo size (main):

   text	   data	    bss	    dec	    hex	filename
 145652	      0	  15788	 161440	  276a0	central

Bloaty diff (PR vs main):

    FILE SIZE        VM SIZE    
 --------------  -------------- 
  +0.0%     +26  [ = ]       0    .debug_line
  +0.0%     +10  [ = ]       0    .debug_loc
  +0.0%      +4  +0.0%      +4    .text
  -3.4%      -2  [ = ]       0    [Unmapped]
  -0.0%    -277  [ = ]       0    .debug_str
  -0.0%    -297  [ = ]       0    .debug_info
  -0.0%    -536  +0.0%      +4    TOTAL
use_rust/rp2040_split (peripheral) — 26.4 KiB → 26.4 KiB (+0.00%)

cargo size (PR):

   text	   data	    bss	    dec	    hex	filename
  24316	     56	   2676	  27048	   69a8	peripheral

cargo size (main):

   text	   data	    bss	    dec	    hex	filename
  24316	     56	   2676	  27048	   69a8	peripheral

Bloaty diff (PR vs main):

    FILE SIZE        VM SIZE    
 --------------  -------------- 
  [ = ]       0  [ = ]       0    TOTAL
use_rust/stm32f1 — 61.8 KiB → 61.8 KiB (+0.00% ⬇️)

cargo size (PR):

   text	   data	    bss	    dec	    hex	filename
  55848	     28	   7408	  63284	   f734	rmk-stm32f1

cargo size (main):

   text	   data	    bss	    dec	    hex	filename
  55852	     28	   7408	  63288	   f738	rmk-stm32f1

Bloaty diff (PR vs main):

    FILE SIZE        VM SIZE    
 --------------  -------------- 
  +0.1%    +294  [ = ]       0    .debug_info
  +0.0%     +91  [ = ]       0    .debug_str
  +0.0%     +23  [ = ]       0    .debug_line
  +7.3%      +3  [ = ]       0    [Unmapped]
  +0.0%      +1  [ = ]       0    .strtab
  -0.0%      -4  -0.0%      -4    .text
  +0.0%    +408  -0.0%      -4    TOTAL
use_rust/stm32h7 — 120.8 KiB → 120.8 KiB (+0.00% ⬆️)

cargo size (PR):

   text	   data	    bss	    dec	    hex	filename
 107972	    324	  15452	 123748	  1e364	rmk-stm32h7

cargo size (main):

   text	   data	    bss	    dec	    hex	filename
 107964	    324	  15452	 123740	  1e35c	rmk-stm32h7

Bloaty diff (PR vs main):

    FILE SIZE        VM SIZE    
 --------------  -------------- 
  +0.1%    +131  [ = ]       0    .debug_line
  +0.0%     +66  [ = ]       0    .debug_info
  +0.0%      +8  +0.0%      +8    .text
 -21.3%     -10  [ = ]       0    [Unmapped]
  -0.0%    -335  [ = ]       0    .debug_str
  -0.0%    -140  +0.0%      +8    TOTAL

My language server keeps running `cargo check`-like commands and causing
whatever lockfiles it hits to be updated. So it's hard to prepare clean
changes when starting from out-of-sync lockfiles.

So add a script that updates them all (conveniently, `cargo fetch` doesn't
even need the target toolchain) and enforces it on CI.

Most (possibly all) of the lockfile updates in this change are to match
`a885a16f`.
@HaoboGu
Copy link
Copy Markdown
Owner

HaoboGu commented May 10, 2026

Great, thanks!

@HaoboGu HaoboGu merged commit 1b9bb72 into HaoboGu:main May 10, 2026
45 checks passed
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.

2 participants