Skip to content

build(deps): llm-tokenizer's toml entry in Cargo.lock names the locked 1.1.6 - #2835

Merged
slin1237 merged 1 commit into
mainfrom
fix/cargo-lock-toml-1.1.6
Oct 7, 2026
Merged

slin1237 merged 1 commit into
mainfrom
fix/cargo-lock-toml-1.1.6

Conversation

@hello-alexmcc

Copy link
Copy Markdown
Collaborator

Description

Problem

main's Cargo.lock fails --locked: cargo metadata --locked exits 101. #2829 moved toml to 1.1.6. #2817, merged after it, added toml to llm-tokenizer's dev-dependencies, and its lock entry still names toml 1.1.5+spec-1.1.0, which the lock no longer holds. A build without --locked silently rewrites the lock, so CI does not see it.

Solution

llm-tokenizer's dependency entry names the locked toml 1.1.6+spec-1.1.0.

Changes

  • Cargo.lock: one line.

Test Plan

  • On main 200ed03: cargo +1.98.0 metadata --locked --format-version 1 exits 101.
  • On this branch: the same command exits 0, and no toml 1.1.5 entry is left.
Checklist
  • cargo +nightly fmt passes
  • cargo clippy --all-targets --all-features -- -D warnings passes
  • (Optional) Documentation updated
  • (Optional) Please join us on Slack #sig-smg to discuss, review, and merge PRs

…d 1.1.6

#2829 moved toml to 1.1.6, and #2817, merged after it, added toml to
llm-tokenizer's dev-dependencies with the lock entry still naming 1.1.5,
which the lock no longer holds. Any --locked build of main fails
(cargo metadata --locked exits 101); with the entry naming 1.1.6 it passes.

Signed-off-by: Alex McC <319643551+hello-alexmcc@users.noreply.github.com>
@coderabbitai

coderabbitai Bot commented Oct 7, 2026

Copy link
Copy Markdown

Important

Review skipped

Review was skipped due to path filters

⛔ Files ignored due to path filters (1)
  • Cargo.lock is excluded by !**/*.lock

CodeRabbit blocks several paths by default. You can override this behavior by explicitly including those paths in the path filters. For example, including **/dist/** will override the default block on the dist directory, by removing the pattern from both the lists.

⚙️ Run configuration
  • Configuration used: Organization UI
  • Review profile: CHILL
  • Plan: Team
  • Run ID: 102c7bd7-510a-4233-8b51-f0caee1b6b5a

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
  • Autopilot · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Comment @coderabbitai help to get the list of available commands.

@github-actions github-actions Bot added the dependencies Dependency updates label Oct 7, 2026
@slin1237
slin1237 merged commit c120afc into main Oct 7, 2026
25 of 41 checks passed
@slin1237
slin1237 deleted the fix/cargo-lock-toml-1.1.6 branch October 7, 2026 03:18
slin1237 added a commit that referenced this pull request Oct 7, 2026
Brings the three commits main gained since eda1134 (#2835 Cargo.lock's
toml entry, #2833 the tagged discovery config with one runtime
conversion, #2838 Qwen3's tagged call syntax) under the leap branch.
Resolutions, both import lists:

- model_gateway/src/config/builder.rs: the `crate::config` import takes
  main's `KubernetesDiscoveryConfig` and the leap's `KvIndexKind`, in
  rustfmt order.
- model_gateway/src/main.rs: the same pair in the same list.

Cargo.lock, bindings/python/src/lib.rs, config/types.rs and
config/validation.rs merged on their own; the bindings build the
discovery config in main's enum form and the runtime conversion is
main's.

Signed-off-by: Simo Lin <25425177+slin1237@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Dependency updates

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants