difftreelog
ci bump Rust version and resolve clippy issues (#160)
in: master
* build: bump Rust version and update dependencies * chore: resolve all reported Clippy issues * build: use the correct Toolchain version * ci: update GitHub Workflows to use valid actions * ci: add permissions to `clippy_check` * chore(GH-160): bump dependencies and disable `thread_local_initializer_can_be_made_const` lint * chore(GH-160): try fixing `thread_local_initializer_can_be_made_const` * fix(GH-160): `serialized-stdlib` feature * ci(GH-160): fix `Test Suite` * fix(GH-160): resolve `insta` deprecation * ci(GH-160): add formatting check job * ci(GH-160): reorganize jobs * style(GH-160): fix formatting * build(GH-160): fix `#[cfg(never)]` * build(GH-160): `#[allow(dead_code)]` on `FinishedRanger::end_token` * build(GH-160): allow more dead code * test(GH-160): fix `golden.rs`
26 files changed
.github/workflows/checks.yamldiffbeforeafterboth--- /dev/null
+++ b/.github/workflows/checks.yaml
@@ -0,0 +1,25 @@
+name: Checks
+on: [ pull_request ]
+jobs:
+ tests:
+ name: Tests
+ uses: ./.github/workflows/test.yaml
+ lints:
+ name: Lints
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4.1.4
+ - uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+ - uses: auguwu/clippy-action@1.3.0
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }}
+ permissions:
+ checks: write
+ formatting:
+ name: Formatting
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4.1.4
+ - uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+ - uses: actions-rust-lang/rustfmt@v1.1.0
+
.github/workflows/clippy_check.ymldiffbeforeafterboth--- a/.github/workflows/clippy_check.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-on: [push, pull_request]
-name: Clippy check
-jobs:
- clippy_check:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - uses: actions-rs/toolchain@v1
- with:
- toolchain: nightly-2023-10-28
- components: clippy
- override: true
- - uses: actions-rs/clippy-check@v1
- with:
- token: ${{ secrets.GITHUB_TOKEN }}
.github/workflows/release.yamldiffbeforeafterboth--- /dev/null
+++ b/.github/workflows/release.yaml
@@ -0,0 +1,140 @@
+name: Release
+on:
+ push:
+ tags: [ 'v*' ]
+jobs:
+ tests:
+ uses: ./.github/workflows/test.yaml
+
+ cargo-release:
+ if: !endsWith(github.ref, '-test')
+ needs: [ tests ]
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4.1.4
+ - name: Install stable toolchain
+ uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+ with:
+ toolchain: stable
+ - run: cargo install cargo-release
+ - run: cargo login ${{ secrets.CARGO_TOKEN }}
+ - run: cargo release --no-dev-version --skip-push --skip-tag --no-confirm
+
+ github-release:
+ needs: [ tests ]
+ strategy:
+ matrix:
+ target:
+ # Linux build notes:
+ # While musl targets are not as supported as gnu, those are most relevant to users,
+ # which want to download binaries from github, as glibc has compatibility issues
+ # with older distros
+
+ # Tier 1
+ - i686-pc-windows-msvc
+ - x86_64-apple-darwin
+ - x86_64-pc-windows-msvc
+
+ # Tier 2
+ - aarch64-apple-darwin
+ - aarch64-unknown-linux-musl
+ - i686-unknown-linux-musl
+ - x86_64-unknown-linux-musl
+ include:
+ # Linux
+ - target: aarch64-unknown-linux-musl
+ os: ubuntu-latest
+ bin: jrsonnet
+ name: jrsonnet-linux-aarch64
+ - target: i686-unknown-linux-musl
+ os: ubuntu-latest
+ bin: jrsonnet
+ name: jrsonnet-linux-i686
+ - target: x86_64-unknown-linux-musl
+ os: ubuntu-latest
+ bin: jrsonnet
+ name: jrsonnet-linux-amd64
+
+ # Windows
+ - target: i686-pc-windows-msvc
+ os: windows-latest
+ bin: jrsonnet.exe
+ name: jrsonnet-windows-i686.exe
+ - target: x86_64-pc-windows-msvc
+ os: windows-latest
+ bin: jrsonnet.exe
+ name: jrsonnet-windows-amd64.exe
+
+ # Apple
+ - target: aarch64-apple-darwin
+ os: macOS-latest
+ bin: jrsonnet
+ name: jrsonnet-darwin-aarch64
+ - target: x86_64-apple-darwin
+ os: macOS-latest
+ bin: jrsonnet
+ name: jrsonnet-darwin-amd64
+ runs-on: ${{ matrix.os }}
+ steps:
+ - name: Fetch apt repo updates
+ if: ${{ startsWith(matrix.os, 'ubuntu-') }}
+ run: sudo apt update
+
+ - name: Install stable toolchain
+ uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+ with:
+ toolchain: stable
+ target: ${{ matrix.target }}
+
+ - uses: actions/checkout@v4.1.4
+
+ - name: Add experimental flags
+ if: ${{ endsWith(github.ref, '-test' )}}
+ run: echo 'EXPERIMENTAL_FLAGS=--features=experimental' >> $GITHUB_ENV
+
+ - name: Linux x86 cross compiler
+ if: ${{ startsWith(matrix.target, 'i686-unknown-linux-') }}
+ run: sudo apt install gcc-multilib
+
+ - name: ARM cross compiler
+ if: ${{ startsWith(matrix.target, 'aarch64-unknown-linux-') }}
+ uses: actions-rs/cargo@v1
+ with:
+ command: install
+ args: cross
+
+ - name: ARM gcc
+ if: ${{ startsWith(matrix.target, 'aarch64-unknown-linux-') }}
+ run: sudo apt install gcc-aarch64-linux-gnu
+
+ - name: Musl gcc
+ if: ${{ endsWith(matrix.target, '-musl') }}
+ run: sudo apt install musl musl-tools
+
+ - name: Run cross build
+ if: ${{ startsWith(matrix.target, 'aarch64-unknown-linux-') }}
+ shell: bash
+ run: cross build --bin=jrsonnet --release --target ${{ matrix.target }} ${{ env.EXPERIMENTAL_FLAGS }}
+
+ - name: Run build
+ if: ${{ !startsWith(matrix.target, 'aarch64-unknown-linux-') }}
+ run: cargo build --bin=jrsonnet --release --target ${{ matrix.target }} ${{ env.EXPERIMENTAL_FLAGS }}
+
+ - name: Package
+ shell: bash
+ run: |
+ cd target/${{ matrix.target }}/release
+
+ cp ${{ matrix.bin }} ../../../${{ matrix.name }}
+ cd -
+
+ - name: Generate SHA-256
+ run: shasum -a 256 ${{ matrix.name }} > ${{ matrix.name }}.sha256
+
+ - name: Publish
+ uses: softprops/action-gh-release@v2.0.4
+ with:
+ draft: true
+ files: "jrsonnet*"
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
.github/workflows/release.ymldiffbeforeafterboth--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,172 +0,0 @@
-name: CI
-on: [push]
-jobs:
- test:
- name: Test Suite
- runs-on: ubuntu-latest
- steps:
- - name: Checkout sources
- uses: actions/checkout@v2
- - name: Install stable toolchain
- uses: actions-rs/toolchain@v1
- with:
- toolchain: stable
- override: true
- - name: Run tests
- uses: actions-rs/cargo@v1
- with:
- command: test
- args: --all
-
- cargo-release:
- if: startsWith(github.ref, 'refs/tags/') && !endsWith(github.ref, '-test')
- needs: [test]
- runs-on: ubuntu-latest
- steps:
- - name: Checkout sources
- uses: actions/checkout@v2
- - name: Install stable toolchain
- uses: actions-rs/toolchain@v1
- with:
- toolchain: stable
- override: true
- - name: Install cargo release command
- uses: actions-rs/cargo@v1
- with:
- command: install
- args: cargo-release
- - name: Run cargo login
- uses: actions-rs/cargo@v1
- with:
- command: login
- args: ${{ secrets.CARGO_TOKEN }}
- - name: Publish crates
- uses: actions-rs/cargo@v1
- with:
- command: release
- args: --no-dev-version --skip-push --skip-tag --no-confirm
-
- github-release:
- if: startsWith(github.ref, 'refs/tags/')
- needs: [test]
- strategy:
- matrix:
- target:
- # Linux build notes:
- # While musl targets are not as supported as gnu, those are most relevant to users,
- # which want to download binaries from github, as glibc has compatibility issues
- # with older distros
-
- # Tier 1
- - i686-pc-windows-msvc
- - x86_64-apple-darwin
- - x86_64-pc-windows-msvc
-
- # Tier 2
- - aarch64-apple-darwin
- - aarch64-unknown-linux-musl
- - i686-unknown-linux-musl
- - x86_64-unknown-linux-musl
- include:
- # Linux
- - target: aarch64-unknown-linux-musl
- os: ubuntu-latest
- bin: jrsonnet
- name: jrsonnet-linux-aarch64
- - target: i686-unknown-linux-musl
- os: ubuntu-latest
- bin: jrsonnet
- name: jrsonnet-linux-i686
- - target: x86_64-unknown-linux-musl
- os: ubuntu-latest
- bin: jrsonnet
- name: jrsonnet-linux-amd64
-
- # Windows
- - target: i686-pc-windows-msvc
- os: windows-latest
- bin: jrsonnet.exe
- name: jrsonnet-windows-i686.exe
- - target: x86_64-pc-windows-msvc
- os: windows-latest
- bin: jrsonnet.exe
- name: jrsonnet-windows-amd64.exe
-
- # Apple
- - target: aarch64-apple-darwin
- os: macOS-latest
- bin: jrsonnet
- name: jrsonnet-darwin-aarch64
- - target: x86_64-apple-darwin
- os: macOS-latest
- bin: jrsonnet
- name: jrsonnet-darwin-amd64
- runs-on: ${{ matrix.os }}
- steps:
- - name: Fetch apt repo updates
- if: ${{ startsWith(matrix.os, 'ubuntu-') }}
- run: sudo apt update
-
- - name: Install stable toolchain
- uses: actions-rs/toolchain@v1
- with:
- toolchain: stable
- override: true
- target: ${{ matrix.target }}
-
- - name: Checkout
- uses: actions/checkout@v2
-
- - name: Add experimental flags
- if: ${{ endsWith(github.ref, '-test' )}}
- run: echo 'EXPERIMENTAL_FLAGS=--features=experimental' >> $GITHUB_ENV
-
- - name: Linux x86 cross compiler
- if: ${{ startsWith(matrix.target, 'i686-unknown-linux-') }}
- run: sudo apt install gcc-multilib
-
- - name: ARM cross compiler
- if: ${{ startsWith(matrix.target, 'aarch64-unknown-linux-') }}
- uses: actions-rs/cargo@v1
- with:
- command: install
- args: cross
-
- - name: ARM gcc
- if: ${{ startsWith(matrix.target, 'aarch64-unknown-linux-') }}
- run: sudo apt install gcc-aarch64-linux-gnu
-
- - name: Musl gcc
- if: ${{ endsWith(matrix.target, '-musl') }}
- run: sudo apt install musl musl-tools
-
- - name: Run cross build
- if: ${{ startsWith(matrix.target, 'aarch64-unknown-linux-') }}
- shell: bash
- run: cross build --bin=jrsonnet --release --target ${{ matrix.target }} ${{ env.EXPERIMENTAL_FLAGS }}
-
- - name: Run build
- if: ${{ !startsWith(matrix.target, 'aarch64-unknown-linux-') }}
- uses: actions-rs/cargo@v1
- with:
- command: build
- args: --bin=jrsonnet --release --target ${{ matrix.target }} ${{ env.EXPERIMENTAL_FLAGS }}
-
- - name: Package
- shell: bash
- run: |
- cd target/${{ matrix.target }}/release
-
- cp ${{ matrix.bin }} ../../../${{ matrix.name }}
- cd -
-
- - name: Generate SHA-256
- run: shasum -a 256 ${{ matrix.name }} > ${{ matrix.name }}.sha256
-
- - name: Publish
- uses: softprops/action-gh-release@v1
- with:
- draft: true
- files: "jrsonnet*"
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
.github/workflows/test.yamldiffbeforeafterboth--- /dev/null
+++ b/.github/workflows/test.yaml
@@ -0,0 +1,21 @@
+name: Test
+on: [ workflow_call ]
+jobs:
+ test:
+ name: Test
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4.1.4
+ - uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+ - run: cargo test --all
+ test-stable:
+ name: Test on stable
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4.1.4
+ - name: Install the latest stable toolchain
+ uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+ with:
+ toolchain: stable
+ - run: cargo test --all
+
Cargo.lockdiffbeforeafterboth445[[package]]5[[package]]6name = "ahash"6name = "ahash"7version = "0.8.9"7version = "0.8.11"8source = "registry+https://github.com/rust-lang/crates.io-index"8source = "registry+https://github.com/rust-lang/crates.io-index"9checksum = "d713b3834d76b85304d4d525563c1276e2e30dc97cc67bfb4585a4a29fc2c89f"9checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"10dependencies = [10dependencies = [11 "cfg-if",11 "cfg-if",12 "once_cell",12 "once_cell",161617[[package]]17[[package]]18name = "aho-corasick"18name = "aho-corasick"19version = "1.1.2"19version = "1.1.3"20source = "registry+https://github.com/rust-lang/crates.io-index"20source = "registry+https://github.com/rust-lang/crates.io-index"21checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"21checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"22dependencies = [22dependencies = [23 "memchr",23 "memchr",24]24]252526[[package]]26[[package]]27name = "allocator-api2"27name = "allocator-api2"28version = "0.2.16"28version = "0.2.18"29source = "registry+https://github.com/rust-lang/crates.io-index"29source = "registry+https://github.com/rust-lang/crates.io-index"30checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"30checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"313132[[package]]32[[package]]33name = "annotate-snippets"33name = "annotate-snippets"34version = "0.10.1"34version = "0.10.2"35source = "registry+https://github.com/rust-lang/crates.io-index"35source = "registry+https://github.com/rust-lang/crates.io-index"36checksum = "0a433302f833baa830c0092100c481c7ea768c5981a3c36f549517a502f246dd"36checksum = "6d9b665789884a7e8fb06c84b295e923b03ca51edbb7d08f91a6a50322ecbfe6"37dependencies = [37dependencies = [38 "anstyle",38 "anstyle",39 "unicode-width",39 "unicode-width",40]40]414142[[package]]42[[package]]43name = "anstream"43name = "anstream"44version = "0.6.12"44version = "0.6.14"45source = "registry+https://github.com/rust-lang/crates.io-index"45source = "registry+https://github.com/rust-lang/crates.io-index"46checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540"46checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"47dependencies = [47dependencies = [48 "anstyle",48 "anstyle",49 "anstyle-parse",49 "anstyle-parse",50 "anstyle-query",50 "anstyle-query",51 "anstyle-wincon",51 "anstyle-wincon",52 "colorchoice",52 "colorchoice",53 "is_terminal_polyfill",53 "utf8parse",54 "utf8parse",54]55]555656[[package]]57[[package]]57name = "anstyle"58name = "anstyle"58version = "1.0.6"59version = "1.0.7"59source = "registry+https://github.com/rust-lang/crates.io-index"60source = "registry+https://github.com/rust-lang/crates.io-index"60checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"61checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"616262[[package]]63[[package]]63name = "anstyle-parse"64name = "anstyle-parse"64version = "0.2.3"65version = "0.2.4"65source = "registry+https://github.com/rust-lang/crates.io-index"66source = "registry+https://github.com/rust-lang/crates.io-index"66checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"67checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"67dependencies = [68dependencies = [68 "utf8parse",69 "utf8parse",69]70]707171[[package]]72[[package]]72name = "anstyle-query"73name = "anstyle-query"73version = "1.0.2"74version = "1.0.3"74source = "registry+https://github.com/rust-lang/crates.io-index"75source = "registry+https://github.com/rust-lang/crates.io-index"75checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"76checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5"76dependencies = [77dependencies = [77 "windows-sys",78 "windows-sys",78]79]798080[[package]]81[[package]]81name = "anstyle-wincon"82name = "anstyle-wincon"82version = "3.0.2"83version = "3.0.3"83source = "registry+https://github.com/rust-lang/crates.io-index"84source = "registry+https://github.com/rust-lang/crates.io-index"84checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"85checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"85dependencies = [86dependencies = [86 "anstyle",87 "anstyle",87 "windows-sys",88 "windows-sys",88]89]899090[[package]]91[[package]]91name = "anyhow"92name = "anyhow"92version = "1.0.80"93version = "1.0.83"93source = "registry+https://github.com/rust-lang/crates.io-index"94source = "registry+https://github.com/rust-lang/crates.io-index"94checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"95checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3"959696[[package]]97[[package]]97name = "autocfg"98name = "autocfg"98version = "1.1.0"99version = "1.3.0"99source = "registry+https://github.com/rust-lang/crates.io-index"100source = "registry+https://github.com/rust-lang/crates.io-index"100checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"101checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"101102102[[package]]103[[package]]103name = "base64"104name = "base64"120 "serde",121 "serde",121]122]122123[[package]]124name = "bitflags"125version = "1.3.2"126source = "registry+https://github.com/rust-lang/crates.io-index"127checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"128123129[[package]]124[[package]]130name = "bitflags"125name = "bitflags"131version = "2.4.2"126version = "2.5.0"132source = "registry+https://github.com/rust-lang/crates.io-index"127source = "registry+https://github.com/rust-lang/crates.io-index"133checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"128checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"134129135[[package]]130[[package]]136name = "block-buffer"131name = "block-buffer"143138144[[package]]139[[package]]145name = "bumpalo"140name = "bumpalo"146version = "3.15.1"141version = "3.16.0"147source = "registry+https://github.com/rust-lang/crates.io-index"142source = "registry+https://github.com/rust-lang/crates.io-index"148checksum = "c764d619ca78fccbf3069b37bd7af92577f044bb15236036662d79b6559f25b7"143checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"149144150[[package]]145[[package]]151name = "cc"146name = "cc"152version = "1.0.83"147version = "1.0.97"153source = "registry+https://github.com/rust-lang/crates.io-index"148source = "registry+https://github.com/rust-lang/crates.io-index"154checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"149checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4"155dependencies = [156 "libc",157]158150159[[package]]151[[package]]160name = "cfg-if"152name = "cfg-if"164156165[[package]]157[[package]]166name = "clap"158name = "clap"167version = "4.5.1"159version = "4.5.4"168source = "registry+https://github.com/rust-lang/crates.io-index"160source = "registry+https://github.com/rust-lang/crates.io-index"169checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da"161checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"170dependencies = [162dependencies = [171 "clap_builder",163 "clap_builder",172 "clap_derive",164 "clap_derive",173]165]174166175[[package]]167[[package]]176name = "clap_builder"168name = "clap_builder"177version = "4.5.1"169version = "4.5.2"178source = "registry+https://github.com/rust-lang/crates.io-index"170source = "registry+https://github.com/rust-lang/crates.io-index"179checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb"171checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"180dependencies = [172dependencies = [181 "anstream",173 "anstream",182 "anstyle",174 "anstyle",186178187[[package]]179[[package]]188name = "clap_complete"180name = "clap_complete"189version = "4.5.1"181version = "4.5.2"190source = "registry+https://github.com/rust-lang/crates.io-index"182source = "registry+https://github.com/rust-lang/crates.io-index"191checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c"183checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e"192dependencies = [184dependencies = [193 "clap",185 "clap",194]186]195187196[[package]]188[[package]]197name = "clap_derive"189name = "clap_derive"198version = "4.5.0"190version = "4.5.4"199source = "registry+https://github.com/rust-lang/crates.io-index"191source = "registry+https://github.com/rust-lang/crates.io-index"200checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47"192checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"201dependencies = [193dependencies = [202 "heck",194 "heck",203 "proc-macro2",195 "proc-macro2",204 "quote",196 "quote",205 "syn 2.0.50",197 "syn 2.0.61",206]198]207199208[[package]]200[[package]]213205214[[package]]206[[package]]215name = "colorchoice"207name = "colorchoice"216version = "1.0.0"208version = "1.0.1"217source = "registry+https://github.com/rust-lang/crates.io-index"209source = "registry+https://github.com/rust-lang/crates.io-index"218checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"210checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"219211220[[package]]212[[package]]221name = "console"213name = "console"283dependencies = [275dependencies = [284 "anyhow",276 "anyhow",285 "bumpalo",277 "bumpalo",286 "indexmap 2.2.3",278 "indexmap 2.2.6",287 "rustc-hash",279 "rustc-hash",288 "serde",280 "serde",289 "unicode-width",281 "unicode-width",297289298[[package]]290[[package]]299name = "either"291name = "either"300version = "1.10.0"292version = "1.11.0"301source = "registry+https://github.com/rust-lang/crates.io-index"293source = "registry+https://github.com/rust-lang/crates.io-index"302checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"294checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"303295304[[package]]296[[package]]305name = "encode_unicode"297name = "encode_unicode"315307316[[package]]308[[package]]317name = "errno"309name = "errno"318version = "0.3.8"310version = "0.3.9"319source = "registry+https://github.com/rust-lang/crates.io-index"311source = "registry+https://github.com/rust-lang/crates.io-index"320checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"312checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"321dependencies = [313dependencies = [322 "libc",314 "libc",323 "windows-sys",315 "windows-sys",324]316]325317326[[package]]318[[package]]327name = "fastrand"319name = "fastrand"328version = "2.0.1"320version = "2.1.0"329source = "registry+https://github.com/rust-lang/crates.io-index"321source = "registry+https://github.com/rust-lang/crates.io-index"330checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"322checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"331323332[[package]]324[[package]]333name = "fnv"325name = "fnv"347339348[[package]]340[[package]]349name = "getrandom"341name = "getrandom"350version = "0.2.12"342version = "0.2.15"351source = "registry+https://github.com/rust-lang/crates.io-index"343source = "registry+https://github.com/rust-lang/crates.io-index"352checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"344checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"353dependencies = [345dependencies = [354 "cfg-if",346 "cfg-if",355 "libc",347 "libc",364356365[[package]]357[[package]]366name = "hashbrown"358name = "hashbrown"367version = "0.14.3"359version = "0.14.5"368source = "registry+https://github.com/rust-lang/crates.io-index"360source = "registry+https://github.com/rust-lang/crates.io-index"369checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"361checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"370dependencies = [362dependencies = [371 "ahash",363 "ahash",372 "allocator-api2",364 "allocator-api2",373]365]374366375[[package]]367[[package]]376name = "heck"368name = "heck"377version = "0.4.1"369version = "0.5.0"378source = "registry+https://github.com/rust-lang/crates.io-index"370source = "registry+https://github.com/rust-lang/crates.io-index"379checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"371checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"380372381[[package]]373[[package]]382name = "hi-doc"374name = "hi-doc"403395404[[package]]396[[package]]405name = "indexmap"397name = "indexmap"406version = "2.2.3"398version = "2.2.6"407source = "registry+https://github.com/rust-lang/crates.io-index"399source = "registry+https://github.com/rust-lang/crates.io-index"408checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"400checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"409dependencies = [401dependencies = [410 "equivalent",402 "equivalent",411 "hashbrown 0.14.3",403 "hashbrown 0.14.5",412 "serde",404 "serde",413]405]414406415[[package]]407[[package]]416name = "indoc"408name = "indoc"417version = "2.0.4"409version = "2.0.5"418source = "registry+https://github.com/rust-lang/crates.io-index"410source = "registry+https://github.com/rust-lang/crates.io-index"419checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"411checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"420412421[[package]]413[[package]]422name = "insta"414name = "insta"423version = "1.35.1"415version = "1.38.0"424source = "registry+https://github.com/rust-lang/crates.io-index"416source = "registry+https://github.com/rust-lang/crates.io-index"425checksum = "7c985c1bef99cf13c58fade470483d81a2bfe846ebde60ed28cc2dddec2df9e2"417checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc"426dependencies = [418dependencies = [427 "console",419 "console",428 "lazy_static",420 "lazy_static",429 "linked-hash-map",421 "linked-hash-map",430 "similar",422 "similar",431 "yaml-rust",432]423]424425[[package]]426name = "is_terminal_polyfill"427version = "1.70.0"428source = "registry+https://github.com/rust-lang/crates.io-index"429checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"433430434[[package]]431[[package]]435name = "itertools"432name = "itertools"442439443[[package]]440[[package]]444name = "itoa"441name = "itoa"445version = "1.0.10"442version = "1.0.11"446source = "registry+https://github.com/rust-lang/crates.io-index"443source = "registry+https://github.com/rust-lang/crates.io-index"447checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"444checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"448445449[[package]]446[[package]]450name = "jrsonnet"447name = "jrsonnet"482 "anyhow",479 "anyhow",483 "bincode",480 "bincode",484 "derivative",481 "derivative",485 "hashbrown 0.14.3",482 "hashbrown 0.14.5",486 "hi-doc",483 "hi-doc",487 "jrsonnet-gcmodule",484 "jrsonnet-gcmodule",488 "jrsonnet-interner",485 "jrsonnet-interner",537name = "jrsonnet-interner"534name = "jrsonnet-interner"538version = "0.5.0-pre96"535version = "0.5.0-pre96"539dependencies = [536dependencies = [540 "hashbrown 0.14.3",537 "hashbrown 0.14.5",541 "jrsonnet-gcmodule",538 "jrsonnet-gcmodule",542 "rustc-hash",539 "rustc-hash",543 "serde",540 "serde",550dependencies = [547dependencies = [551 "proc-macro2",548 "proc-macro2",552 "quote",549 "quote",553 "syn 2.0.50",550 "syn 2.0.61",554]551]555552556[[package]]553[[package]]627624628[[package]]625[[package]]629name = "libc"626name = "libc"630version = "0.2.153"627version = "0.2.154"631source = "registry+https://github.com/rust-lang/crates.io-index"628source = "registry+https://github.com/rust-lang/crates.io-index"632checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"629checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"633630634[[package]]631[[package]]635name = "libjsonnet"632name = "libjsonnet"655652656[[package]]653[[package]]657name = "lock_api"654name = "lock_api"658version = "0.4.11"655version = "0.4.12"659source = "registry+https://github.com/rust-lang/crates.io-index"656source = "registry+https://github.com/rust-lang/crates.io-index"660checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"657checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"661dependencies = [658dependencies = [662 "autocfg",659 "autocfg",663 "scopeguard",660 "scopeguard",684 "proc-macro2",681 "proc-macro2",685 "quote",682 "quote",686 "regex-syntax",683 "regex-syntax",687 "syn 2.0.50",684 "syn 2.0.61",688]685]689686690[[package]]687[[package]]698695699[[package]]696[[package]]700name = "lru"697name = "lru"701version = "0.12.2"698version = "0.12.3"702source = "registry+https://github.com/rust-lang/crates.io-index"699source = "registry+https://github.com/rust-lang/crates.io-index"703checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22"700checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"704dependencies = [701dependencies = [705 "hashbrown 0.14.3",702 "hashbrown 0.14.5",706]703]707704708[[package]]705[[package]]713710714[[package]]711[[package]]715name = "memchr"712name = "memchr"716version = "2.7.1"713version = "2.7.2"717source = "registry+https://github.com/rust-lang/crates.io-index"714source = "registry+https://github.com/rust-lang/crates.io-index"718checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"715checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"719716720[[package]]717[[package]]721name = "memoffset"718name = "memoffset"722version = "0.9.0"719version = "0.9.1"723source = "registry+https://github.com/rust-lang/crates.io-index"720source = "registry+https://github.com/rust-lang/crates.io-index"724checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"721checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"725dependencies = [722dependencies = [726 "autocfg",723 "autocfg",727]724]747744748[[package]]745[[package]]749name = "num-bigint"746name = "num-bigint"750version = "0.4.4"747version = "0.4.5"751source = "registry+https://github.com/rust-lang/crates.io-index"748source = "registry+https://github.com/rust-lang/crates.io-index"752checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"749checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7"753dependencies = [750dependencies = [754 "autocfg",755 "num-integer",751 "num-integer",756 "num-traits",752 "num-traits",757 "serde",753 "serde",768764769[[package]]765[[package]]770name = "num-traits"766name = "num-traits"771version = "0.2.18"767version = "0.2.19"772source = "registry+https://github.com/rust-lang/crates.io-index"768source = "registry+https://github.com/rust-lang/crates.io-index"773checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"769checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"774dependencies = [770dependencies = [775 "autocfg",771 "autocfg",776]772]783779784[[package]]780[[package]]785name = "parking_lot"781name = "parking_lot"786version = "0.12.1"782version = "0.12.2"787source = "registry+https://github.com/rust-lang/crates.io-index"783source = "registry+https://github.com/rust-lang/crates.io-index"788checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"784checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"789dependencies = [785dependencies = [790 "lock_api",786 "lock_api",791 "parking_lot_core",787 "parking_lot_core",792]788]793789794[[package]]790[[package]]795name = "parking_lot_core"791name = "parking_lot_core"796version = "0.9.9"792version = "0.9.10"797source = "registry+https://github.com/rust-lang/crates.io-index"793source = "registry+https://github.com/rust-lang/crates.io-index"798checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"794checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"799dependencies = [795dependencies = [800 "cfg-if",796 "cfg-if",801 "libc",797 "libc",802 "redox_syscall",798 "redox_syscall",803 "smallvec",799 "smallvec",804 "windows-targets 0.48.5",800 "windows-targets",805]801]806802807[[package]]803[[package]]812808813[[package]]809[[package]]814name = "peg"810name = "peg"815version = "0.8.2"811version = "0.8.3"816source = "registry+https://github.com/rust-lang/crates.io-index"812source = "registry+https://github.com/rust-lang/crates.io-index"817checksum = "400bcab7d219c38abf8bd7cc2054eb9bbbd4312d66f6a5557d572a203f646f61"813checksum = "8a625d12ad770914cbf7eff6f9314c3ef803bfe364a1b20bc36ddf56673e71e5"818dependencies = [814dependencies = [819 "peg-macros",815 "peg-macros",820 "peg-runtime",816 "peg-runtime",821]817]822818823[[package]]819[[package]]824name = "peg-macros"820name = "peg-macros"825version = "0.8.2"821version = "0.8.3"826source = "registry+https://github.com/rust-lang/crates.io-index"822source = "registry+https://github.com/rust-lang/crates.io-index"827checksum = "46e61cce859b76d19090f62da50a9fe92bab7c2a5f09e183763559a2ac392c90"823checksum = "f241d42067ed3ab6a4fece1db720838e1418f36d868585a27931f95d6bc03582"828dependencies = [824dependencies = [829 "peg-runtime",825 "peg-runtime",830 "proc-macro2",826 "proc-macro2",833829834[[package]]830[[package]]835name = "peg-runtime"831name = "peg-runtime"836version = "0.8.2"832version = "0.8.3"837source = "registry+https://github.com/rust-lang/crates.io-index"833source = "registry+https://github.com/rust-lang/crates.io-index"838checksum = "36bae92c60fa2398ce4678b98b2c4b5a7c61099961ca1fa305aec04a9ad28922"834checksum = "e3aeb8f54c078314c2065ee649a7241f46b9d8e418e1a9581ba0546657d7aa3a"839835840[[package]]836[[package]]841name = "ppv-lite86"837name = "ppv-lite86"845841846[[package]]842[[package]]847name = "proc-macro2"843name = "proc-macro2"848version = "1.0.78"844version = "1.0.82"849source = "registry+https://github.com/rust-lang/crates.io-index"845source = "registry+https://github.com/rust-lang/crates.io-index"850checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"846checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"851dependencies = [847dependencies = [852 "unicode-ident",848 "unicode-ident",853]849]854850855[[package]]851[[package]]856name = "quote"852name = "quote"857version = "1.0.35"853version = "1.0.36"858source = "registry+https://github.com/rust-lang/crates.io-index"854source = "registry+https://github.com/rust-lang/crates.io-index"859checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"855checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"860dependencies = [856dependencies = [861 "proc-macro2",857 "proc-macro2",862]858]911907912[[package]]908[[package]]913name = "redox_syscall"909name = "redox_syscall"914version = "0.4.1"910version = "0.5.1"915source = "registry+https://github.com/rust-lang/crates.io-index"911source = "registry+https://github.com/rust-lang/crates.io-index"916checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"912checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"917dependencies = [913dependencies = [918 "bitflags 1.3.2",914 "bitflags",919]915]920916921[[package]]917[[package]]922name = "regex"918name = "regex"923version = "1.10.3"919version = "1.10.4"924source = "registry+https://github.com/rust-lang/crates.io-index"920source = "registry+https://github.com/rust-lang/crates.io-index"925checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"921checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"926dependencies = [922dependencies = [927 "aho-corasick",923 "aho-corasick",928 "memchr",924 "memchr",932928933[[package]]929[[package]]934name = "regex-automata"930name = "regex-automata"935version = "0.4.5"931version = "0.4.6"936source = "registry+https://github.com/rust-lang/crates.io-index"932source = "registry+https://github.com/rust-lang/crates.io-index"937checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"933checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"938dependencies = [934dependencies = [939 "aho-corasick",935 "aho-corasick",940 "memchr",936 "memchr",943939944[[package]]940[[package]]945name = "regex-syntax"941name = "regex-syntax"946version = "0.8.2"942version = "0.8.3"947source = "registry+https://github.com/rust-lang/crates.io-index"943source = "registry+https://github.com/rust-lang/crates.io-index"948checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"944checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"949945950[[package]]946[[package]]951name = "rowan"947name = "rowan"954checksum = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49"950checksum = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49"955dependencies = [951dependencies = [956 "countme",952 "countme",957 "hashbrown 0.14.3",953 "hashbrown 0.14.5",958 "memoffset",954 "memoffset",959 "rustc-hash",955 "rustc-hash",960 "text-size",956 "text-size",968964969[[package]]965[[package]]970name = "rustix"966name = "rustix"971version = "0.38.31"967version = "0.38.34"972source = "registry+https://github.com/rust-lang/crates.io-index"968source = "registry+https://github.com/rust-lang/crates.io-index"973checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"969checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"974dependencies = [970dependencies = [975 "bitflags 2.4.2",971 "bitflags",976 "errno",972 "errno",977 "libc",973 "libc",978 "linux-raw-sys",974 "linux-raw-sys",981977982[[package]]978[[package]]983name = "ryu"979name = "ryu"984version = "1.0.17"980version = "1.0.18"985source = "registry+https://github.com/rust-lang/crates.io-index"981source = "registry+https://github.com/rust-lang/crates.io-index"986checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"982checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"987983988[[package]]984[[package]]989name = "scopeguard"985name = "scopeguard"993989994[[package]]990[[package]]995name = "serde"991name = "serde"996version = "1.0.197"992version = "1.0.201"997source = "registry+https://github.com/rust-lang/crates.io-index"993source = "registry+https://github.com/rust-lang/crates.io-index"998checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"994checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c"999dependencies = [995dependencies = [1000 "serde_derive",996 "serde_derive",1001]997]10029981003[[package]]999[[package]]1004name = "serde_derive"1000name = "serde_derive"1005version = "1.0.197"1001version = "1.0.201"1006source = "registry+https://github.com/rust-lang/crates.io-index"1002source = "registry+https://github.com/rust-lang/crates.io-index"1007checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"1003checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865"1008dependencies = [1004dependencies = [1009 "proc-macro2",1005 "proc-macro2",1010 "quote",1006 "quote",1011 "syn 2.0.50",1007 "syn 2.0.61",1012]1008]101310091014[[package]]1010[[package]]1015name = "serde_json"1011name = "serde_json"1016version = "1.0.114"1012version = "1.0.117"1017source = "registry+https://github.com/rust-lang/crates.io-index"1013source = "registry+https://github.com/rust-lang/crates.io-index"1018checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"1014checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"1019dependencies = [1015dependencies = [1020 "itoa",1016 "itoa",1021 "ryu",1017 "ryu",106810641069[[package]]1065[[package]]1070name = "similar"1066name = "similar"1071version = "2.4.0"1067version = "2.5.0"1072source = "registry+https://github.com/rust-lang/crates.io-index"1068source = "registry+https://github.com/rust-lang/crates.io-index"1073checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21"1069checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640"107410701075[[package]]1071[[package]]1076name = "smallvec"1072name = "smallvec"108610821087[[package]]1083[[package]]1088name = "strsim"1084name = "strsim"1089version = "0.11.0"1085version = "0.11.1"1090source = "registry+https://github.com/rust-lang/crates.io-index"1086source = "registry+https://github.com/rust-lang/crates.io-index"1091checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"1087checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"109210881093[[package]]1089[[package]]1094name = "structdump"1090name = "structdump"112511211126[[package]]1122[[package]]1127name = "syn"1123name = "syn"1128version = "2.0.50"1124version = "2.0.61"1129source = "registry+https://github.com/rust-lang/crates.io-index"1125source = "registry+https://github.com/rust-lang/crates.io-index"1130checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb"1126checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"1131dependencies = [1127dependencies = [1132 "proc-macro2",1128 "proc-macro2",1133 "quote",1129 "quote",113611321137[[package]]1133[[package]]1138name = "tempfile"1134name = "tempfile"1139version = "3.10.0"1135version = "3.10.1"1140source = "registry+https://github.com/rust-lang/crates.io-index"1136source = "registry+https://github.com/rust-lang/crates.io-index"1141checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"1137checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"1142dependencies = [1138dependencies = [1143 "cfg-if",1139 "cfg-if",1144 "fastrand",1140 "fastrand",116411601165[[package]]1161[[package]]1166name = "thiserror"1162name = "thiserror"1167version = "1.0.57"1163version = "1.0.60"1168source = "registry+https://github.com/rust-lang/crates.io-index"1164source = "registry+https://github.com/rust-lang/crates.io-index"1169checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"1165checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18"1170dependencies = [1166dependencies = [1171 "thiserror-impl",1167 "thiserror-impl",1172]1168]117311691174[[package]]1170[[package]]1175name = "thiserror-impl"1171name = "thiserror-impl"1176version = "1.0.57"1172version = "1.0.60"1177source = "registry+https://github.com/rust-lang/crates.io-index"1173source = "registry+https://github.com/rust-lang/crates.io-index"1178checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"1174checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524"1179dependencies = [1175dependencies = [1180 "proc-macro2",1176 "proc-macro2",1181 "quote",1177 "quote",1182 "syn 2.0.50",1178 "syn 2.0.61",1183]1179]118411801185[[package]]1181[[package]]120211981203[[package]]1199[[package]]1204name = "unicode-width"1200name = "unicode-width"1205version = "0.1.11"1201version = "0.1.12"1206source = "registry+https://github.com/rust-lang/crates.io-index"1202source = "registry+https://github.com/rust-lang/crates.io-index"1207checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"1203checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"120812041209[[package]]1205[[package]]1210name = "utf8parse"1206name = "utf8parse"1230source = "registry+https://github.com/rust-lang/crates.io-index"1226source = "registry+https://github.com/rust-lang/crates.io-index"1231checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"1227checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"1232dependencies = [1228dependencies = [1233 "windows-targets 0.52.0",1229 "windows-targets",1234]1230]12351236[[package]]1237name = "windows-targets"1238version = "0.48.5"1239source = "registry+https://github.com/rust-lang/crates.io-index"1240checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"1241dependencies = [1242 "windows_aarch64_gnullvm 0.48.5",1243 "windows_aarch64_msvc 0.48.5",1244 "windows_i686_gnu 0.48.5",1245 "windows_i686_msvc 0.48.5",1246 "windows_x86_64_gnu 0.48.5",1247 "windows_x86_64_gnullvm 0.48.5",1248 "windows_x86_64_msvc 0.48.5",1249]125012311251[[package]]1232[[package]]1252name = "windows-targets"1233name = "windows-targets"1253version = "0.52.0"1234version = "0.52.5"1254source = "registry+https://github.com/rust-lang/crates.io-index"1235source = "registry+https://github.com/rust-lang/crates.io-index"1255checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"1236checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"1256dependencies = [1237dependencies = [1257 "windows_aarch64_gnullvm 0.52.0",1238 "windows_aarch64_gnullvm",1258 "windows_aarch64_msvc 0.52.0",1239 "windows_aarch64_msvc",1259 "windows_i686_gnu 0.52.0",1240 "windows_i686_gnu",1241 "windows_i686_gnullvm",1260 "windows_i686_msvc 0.52.0",1242 "windows_i686_msvc",1261 "windows_x86_64_gnu 0.52.0",1243 "windows_x86_64_gnu",1262 "windows_x86_64_gnullvm 0.52.0",1244 "windows_x86_64_gnullvm",1263 "windows_x86_64_msvc 0.52.0",1245 "windows_x86_64_msvc",1264]1246]12651266[[package]]1267name = "windows_aarch64_gnullvm"1268version = "0.48.5"1269source = "registry+https://github.com/rust-lang/crates.io-index"1270checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"127112471272[[package]]1248[[package]]1273name = "windows_aarch64_gnullvm"1249name = "windows_aarch64_gnullvm"1274version = "0.52.0"1250version = "0.52.5"1275source = "registry+https://github.com/rust-lang/crates.io-index"1251source = "registry+https://github.com/rust-lang/crates.io-index"1276checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"1252checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"12771278[[package]]1279name = "windows_aarch64_msvc"1280version = "0.48.5"1281source = "registry+https://github.com/rust-lang/crates.io-index"1282checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"128312531284[[package]]1254[[package]]1285name = "windows_aarch64_msvc"1255name = "windows_aarch64_msvc"1286version = "0.52.0"1256version = "0.52.5"1287source = "registry+https://github.com/rust-lang/crates.io-index"1257source = "registry+https://github.com/rust-lang/crates.io-index"1288checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"1258checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"128912591290[[package]]1260[[package]]1291name = "windows_i686_gnu"1261name = "windows_i686_gnu"1292version = "0.48.5"1262version = "0.52.5"1293source = "registry+https://github.com/rust-lang/crates.io-index"1263source = "registry+https://github.com/rust-lang/crates.io-index"1294checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"1264checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"129512651296[[package]]1266[[package]]1297name = "windows_i686_gnu"1267name = "windows_i686_gnullvm"1298version = "0.52.0"1268version = "0.52.5"1299source = "registry+https://github.com/rust-lang/crates.io-index"1269source = "registry+https://github.com/rust-lang/crates.io-index"1300checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"1270checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"13011302[[package]]1303name = "windows_i686_msvc"1304version = "0.48.5"1305source = "registry+https://github.com/rust-lang/crates.io-index"1306checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"130712711308[[package]]1272[[package]]1309name = "windows_i686_msvc"1273name = "windows_i686_msvc"1310version = "0.52.0"1274version = "0.52.5"1311source = "registry+https://github.com/rust-lang/crates.io-index"1275source = "registry+https://github.com/rust-lang/crates.io-index"1312checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"1276checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"13131314[[package]]1315name = "windows_x86_64_gnu"1316version = "0.48.5"1317source = "registry+https://github.com/rust-lang/crates.io-index"1318checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"131912771320[[package]]1278[[package]]1321name = "windows_x86_64_gnu"1279name = "windows_x86_64_gnu"1322version = "0.52.0"1280version = "0.52.5"1323source = "registry+https://github.com/rust-lang/crates.io-index"1281source = "registry+https://github.com/rust-lang/crates.io-index"1324checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"1282checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"13251326[[package]]1327name = "windows_x86_64_gnullvm"1328version = "0.48.5"1329source = "registry+https://github.com/rust-lang/crates.io-index"1330checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"133112831332[[package]]1284[[package]]1333name = "windows_x86_64_gnullvm"1285name = "windows_x86_64_gnullvm"1334version = "0.52.0"1286version = "0.52.5"1335source = "registry+https://github.com/rust-lang/crates.io-index"1287source = "registry+https://github.com/rust-lang/crates.io-index"1336checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"1288checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"13371338[[package]]1339name = "windows_x86_64_msvc"1340version = "0.48.5"1341source = "registry+https://github.com/rust-lang/crates.io-index"1342checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"134312891344[[package]]1290[[package]]1345name = "windows_x86_64_msvc"1291name = "windows_x86_64_msvc"1346version = "0.52.0"1292version = "0.52.5"1347source = "registry+https://github.com/rust-lang/crates.io-index"1293source = "registry+https://github.com/rust-lang/crates.io-index"1348checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"1294checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"134912951350[[package]]1296[[package]]1351name = "xshell"1297name = "xshell"1352version = "0.2.5"1298version = "0.2.6"1353source = "registry+https://github.com/rust-lang/crates.io-index"1299source = "registry+https://github.com/rust-lang/crates.io-index"1354checksum = "ce2107fe03e558353b4c71ad7626d58ed82efaf56c54134228608893c77023ad"1300checksum = "6db0ab86eae739efd1b054a8d3d16041914030ac4e01cd1dca0cf252fd8b6437"1355dependencies = [1301dependencies = [1356 "xshell-macros",1302 "xshell-macros",1357]1303]135813041359[[package]]1305[[package]]1360name = "xshell-macros"1306name = "xshell-macros"1361version = "0.2.5"1307version = "0.2.6"1362source = "registry+https://github.com/rust-lang/crates.io-index"1308source = "registry+https://github.com/rust-lang/crates.io-index"1363checksum = "7e2c411759b501fb9501aac2b1b2d287a6e93e5bdcf13c25306b23e1b716dd0e"1309checksum = "9d422e8e38ec76e2f06ee439ccc765e9c6a9638b9e7c9f2e8255e4d41e8bd852"136413101365[[package]]1311[[package]]1366name = "xtask"1312name = "xtask"1367version = "0.1.0"1313version = "0.1.0"1368dependencies = [1314dependencies = [1369 "anyhow",1315 "anyhow",1370 "indexmap 2.2.3",1316 "indexmap 2.2.6",1371 "itertools",1317 "itertools",1372 "proc-macro2",1318 "proc-macro2",1373 "quote",1319 "quote",138613321387[[package]]1333[[package]]1388name = "zerocopy"1334name = "zerocopy"1389version = "0.7.32"1335version = "0.7.34"1390source = "registry+https://github.com/rust-lang/crates.io-index"1336source = "registry+https://github.com/rust-lang/crates.io-index"1391checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"1337checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"1392dependencies = [1338dependencies = [1393 "zerocopy-derive",1339 "zerocopy-derive",1394]1340]139513411396[[package]]1342[[package]]1397name = "zerocopy-derive"1343name = "zerocopy-derive"1398version = "0.7.32"1344version = "0.7.34"1399source = "registry+https://github.com/rust-lang/crates.io-index"1345source = "registry+https://github.com/rust-lang/crates.io-index"1400checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"1346checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"1401dependencies = [1347dependencies = [1402 "proc-macro2",1348 "proc-macro2",1403 "quote",1349 "quote",1404 "syn 2.0.50",1350 "syn 2.0.61",1405]1351]14061352cmds/jrsonnet-fmt/src/tests.rsdiffbeforeafterboth--- a/cmds/jrsonnet-fmt/src/tests.rs
+++ b/cmds/jrsonnet-fmt/src/tests.rs
@@ -23,7 +23,7 @@
#[test]
fn complex_comments_snapshot() {
- insta::assert_display_snapshot!(reformat(indoc!(
+ insta::assert_snapshot!(reformat(indoc!(
"{
comments: {
_: '',
crates/jrsonnet-cli/src/tla.rsdiffbeforeafterboth--- a/crates/jrsonnet-cli/src/tla.rs
+++ b/crates/jrsonnet-cli/src/tla.rs
@@ -14,7 +14,7 @@
pub struct TlaOpts {
/// Add top level string argument.
/// Top level arguments will be passed to function before manifestification stage.
- /// This is preferred to ExtVars method.
+ /// This is preferred to [`ExtVars`] method.
/// If [=data] is not set then it will be read from `name` env variable.
#[clap(long, short = 'A', name = "name[=tla data]", number_of_values = 1)]
tla_str: Vec<ExtStr>,
crates/jrsonnet-evaluator/src/arr/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/arr/mod.rs
+++ b/crates/jrsonnet-evaluator/src/arr/mod.rs
@@ -7,8 +7,7 @@
use crate::{function::FuncVal, gc::TraceBox, tb, Context, Result, Thunk, Val};
mod spec;
-pub use spec::ArrayLike;
-pub(crate) use spec::*;
+pub use spec::{ArrayLike, *};
/// Represents a Jsonnet array value.
#[derive(Debug, Clone, Trace)]
crates/jrsonnet-evaluator/src/function/arglike.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/function/arglike.rs
+++ b/crates/jrsonnet-evaluator/src/function/arglike.rs
@@ -76,13 +76,6 @@
}
}
-mod sealed {
- /// Implemented for `ArgsLike`, where only unnamed arguments present
- pub trait Unnamed {}
- /// Implemented for `ArgsLike`, where only named arguments present
- pub trait Named {}
-}
-
pub trait ArgsLike {
fn unnamed_len(&self) -> usize;
fn unnamed_iter(
@@ -182,7 +175,6 @@
}
}
-impl<V: ArgLike, S> sealed::Named for HashMap<IStr, V, S> {}
impl<V: ArgLike, S> ArgsLike for HashMap<IStr, V, S> {
fn unnamed_len(&self) -> usize {
0
@@ -247,7 +239,6 @@
macro_rules! impl_args_like {
($count:expr; $($gen:ident)*) => {
- impl<$($gen: ArgLike,)*> sealed::Unnamed for ($($gen,)*) {}
impl<$($gen: ArgLike,)*> ArgsLike for ($($gen,)*) {
fn unnamed_len(&self) -> usize {
$count
@@ -279,7 +270,6 @@
}
impl<$($gen: ArgLike,)*> OptionalContext for ($($gen,)*) where $($gen: OptionalContext),* {}
- impl<$($gen: ArgLike,)*> sealed::Named for ($((IStr, $gen),)*) {}
impl<$($gen: ArgLike,)*> ArgsLike for ($((IStr, $gen),)*) {
fn unnamed_len(&self) -> usize {
0
crates/jrsonnet-evaluator/src/integrations/serde.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/integrations/serde.rs
+++ b/crates/jrsonnet-evaluator/src/integrations/serde.rs
@@ -346,9 +346,9 @@
type Ok = Val;
type Error = JrError;
- fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<()>
+ fn serialize_key<T>(&mut self, key: &T) -> Result<()>
where
- T: Serialize,
+ T: ?Sized + Serialize,
{
let key = key.serialize(IntoValSerializer)?;
let key = key.to_string()?;
@@ -356,9 +356,9 @@
Ok(())
}
- fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<()>
+ fn serialize_value<T>(&mut self, value: &T) -> Result<()>
where
- T: Serialize,
+ T: ?Sized + Serialize,
{
let key = self.key.take().expect("no serialize_key called");
let value = value.serialize(IntoValSerializer)?;
@@ -367,10 +367,10 @@
}
// TODO: serialize_key/serialize_value
- fn serialize_entry<K: ?Sized, V: ?Sized>(&mut self, key: &K, value: &V) -> Result<()>
+ fn serialize_entry<K, V>(&mut self, key: &K, value: &V) -> Result<()>
where
- K: Serialize,
- V: Serialize,
+ K: ?Sized + Serialize,
+ V: ?Sized + Serialize,
{
let key = key.serialize(IntoValSerializer)?;
let key = key.to_string()?;
@@ -394,9 +394,9 @@
type Ok = Val;
type Error = JrError;
- fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<()>
+ fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<()>
where
- T: Serialize,
+ T: ?Sized + Serialize,
{
SerializeMap::serialize_entry(self, key, value)?;
Ok(())
@@ -411,9 +411,9 @@
type Error = JrError;
- fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<()>
+ fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<()>
where
- T: Serialize,
+ T: ?Sized + Serialize,
{
SerializeMap::serialize_entry(self, key, value)?;
Ok(())
@@ -504,9 +504,9 @@
Ok(Val::Null)
}
- fn serialize_some<T: ?Sized>(self, value: &T) -> Result<Val>
+ fn serialize_some<T>(self, value: &T) -> Result<Val>
where
- T: Serialize,
+ T: ?Sized + Serialize,
{
value.serialize(self)
}
@@ -528,14 +528,14 @@
Ok(Val::Str(variant.into()))
}
- fn serialize_newtype_struct<T: ?Sized>(self, _name: &'static str, value: &T) -> Result<Val>
+ fn serialize_newtype_struct<T>(self, _name: &'static str, value: &T) -> Result<Val>
where
- T: Serialize,
+ T: ?Sized + Serialize,
{
value.serialize(self)
}
- fn serialize_newtype_variant<T: ?Sized>(
+ fn serialize_newtype_variant<T>(
self,
_name: &'static str,
_variant_index: u32,
@@ -543,7 +543,7 @@
value: &T,
) -> Result<Val>
where
- T: Serialize,
+ T: ?Sized + Serialize,
{
let mut out = ObjValue::builder_with_capacity(1);
let value = value.serialize(self)?;
crates/jrsonnet-evaluator/src/manifest.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/manifest.rs
@@ -1,4 +1,4 @@
-use std::{borrow::Cow, fmt::Write};
+use std::{borrow::Cow, fmt::Write, ptr};
use crate::{bail, Result, ResultExt, State, Val};
@@ -404,7 +404,7 @@
pub fn escape_string_json_buf(value: &str, buf: &mut String) {
// Safety: we only write correct utf-8 in this function
- let buf: &mut Vec<u8> = unsafe { &mut *(buf as *mut String).cast::<Vec<u8>>() };
+ let buf: &mut Vec<u8> = unsafe { &mut *ptr::from_mut(buf).cast::<Vec<u8>>() };
let bytes = value.as_bytes();
// Perfect for ascii strings, removes any reallocations
crates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -88,7 +88,7 @@
}
}
-use ordering::*;
+use ordering::{FieldIndex, FieldSortKey, SuperDepth};
// 0 - add
// 12 - visibility
crates/jrsonnet-evaluator/src/stack.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/stack.rs
+++ b/crates/jrsonnet-evaluator/src/stack.rs
@@ -8,6 +8,7 @@
}
#[cfg(feature = "nightly")]
+#[allow(clippy::thread_local_initializer_can_be_made_const)]
#[thread_local]
static STACK_LIMIT: StackLimit = StackLimit {
max_stack_size: Cell::new(200),
@@ -15,9 +16,11 @@
};
#[cfg(not(feature = "nightly"))]
thread_local! {
- static STACK_LIMIT: StackLimit = StackLimit {
- max_stack_size: Cell::new(200),
- current_depth: Cell::new(0),
+ static STACK_LIMIT: StackLimit = const {
+ StackLimit {
+ max_stack_size: Cell::new(200),
+ current_depth: Cell::new(0),
+ }
};
}
@@ -40,7 +43,7 @@
fn drop(&mut self) {
STACK_LIMIT
.current_depth
- .set(STACK_LIMIT.current_depth.get() - 1)
+ .set(STACK_LIMIT.current_depth.get() - 1);
}
#[cfg(not(feature = "nightly"))]
fn drop(&mut self) {
@@ -75,7 +78,7 @@
impl Drop for StackDepthLimitOverrideGuard {
#[cfg(feature = "nightly")]
fn drop(&mut self) {
- STACK_LIMIT.max_stack_size.set(self.old_limit)
+ STACK_LIMIT.max_stack_size.set(self.old_limit);
}
#[cfg(not(feature = "nightly"))]
fn drop(&mut self) {
crates/jrsonnet-evaluator/src/typed/conversions.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/typed/conversions.rs
+++ b/crates/jrsonnet-evaluator/src/typed/conversions.rs
@@ -143,6 +143,7 @@
_ => unreachable!(),
}
}
+ #[allow(clippy::cast_lossless)]
fn into_untyped(value: Self) -> Result<Val> {
Ok(Val::Num(value as f64))
}
@@ -199,6 +200,7 @@
}
}
+ #[allow(clippy::cast_lossless)]
fn into_untyped(value: Self) -> Result<Val> {
Ok(Val::Num(value.0 as f64))
}
crates/jrsonnet-rowan-parser/src/marker.rsdiffbeforeafterboth--- a/crates/jrsonnet-rowan-parser/src/marker.rs
+++ b/crates/jrsonnet-rowan-parser/src/marker.rs
@@ -22,6 +22,7 @@
pub struct FinishedRanger {
pub start_token: usize,
+ #[allow(dead_code)]
pub end_token: usize,
}
impl FinishedRanger {
crates/jrsonnet-rowan-parser/src/tests.rsdiffbeforeafterboth--- a/crates/jrsonnet-rowan-parser/src/tests.rs
+++ b/crates/jrsonnet-rowan-parser/src/tests.rs
@@ -1,4 +1,5 @@
-#![cfg(never)]
+// `never`
+#![cfg(any())]
use miette::{
Diagnostic, GraphicalReportHandler, GraphicalTheme, LabeledSpan, ThemeCharacters, ThemeStyles,
crates/jrsonnet-stdlib/Cargo.tomldiffbeforeafterboth--- a/crates/jrsonnet-stdlib/Cargo.toml
+++ b/crates/jrsonnet-stdlib/Cargo.toml
@@ -12,19 +12,23 @@
[features]
default = ["codegenerated-stdlib"]
-# Speed-up initialization by generating code for parsed stdlib, instead
-# of invoking parser for it
+# Speed-up initialization by generating code for parsed stdlib,
+# instead of invoking parser for it.
+# This is mutually exclusive with `serialized-stdlib`.
codegenerated-stdlib = ["jrsonnet-parser/structdump"]
+# Use the embedded serialized stdlib.
+# This is mutually exclusive with `codegenerated-stdlib`.
+serialized-stdlib = []
# Enables legacy `std.thisFile` support, at the cost of worse caching
legacy-this-file = []
# Add order preservation flag to some functions
exp-preserve-order = ["jrsonnet-evaluator/exp-preserve-order"]
# Bigint type
-exp-bigint = ["num-bigint", "jrsonnet-evaluator/exp-bigint"]
+exp-bigint = ["dep:num-bigint", "jrsonnet-evaluator/exp-bigint"]
exp-null-coaelse = ["jrsonnet-parser/exp-null-coaelse", "jrsonnet-evaluator/exp-null-coaelse"]
# std.regexMatch and other helpers
-exp-regex = ["regex", "lru", "rustc-hash"]
+exp-regex = ["dep:regex", "dep:lru", "dep:rustc-hash"]
[dependencies]
jrsonnet-evaluator.workspace = true
crates/jrsonnet-stdlib/src/expr.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/expr.rs
+++ b/crates/jrsonnet-stdlib/src/expr.rs
@@ -1,7 +1,11 @@
use jrsonnet_parser::LocExpr;
pub fn stdlib_expr() -> LocExpr {
- #[cfg(feature = "serialized-stdlib")]
+ #[cfg(all(feature = "serialized-stdlib", feature = "codegenerated-stdlib"))]
+ compile_error!(
+ "features `serialized-stdlib` and `codegenerated-stdlib` are mutually exclusive"
+ );
+ #[cfg(all(feature = "serialized-stdlib", not(feature = "codegenerated-stdlib")))]
{
use bincode::{BincodeRead, DefaultOptions, Options};
use serde::{Deserialize, Deserializer};
@@ -77,7 +81,7 @@
LocExpr::deserialize(&mut deserializer).unwrap()
}
- #[cfg(feature = "codegenerated-stdlib")]
+ #[cfg(all(feature = "codegenerated-stdlib", not(feature = "serialized-stdlib")))]
{
mod structdump_import {
pub(super) use std::{option::Option, rc::Rc, vec};
@@ -88,7 +92,7 @@
include!(concat!(env!("OUT_DIR"), "/stdlib.rs"))
}
- #[cfg(not(feature = "codegenerated-stdlib"))]
+ #[cfg(not(any(feature = "serialized-stdlib", feature = "codegenerated-stdlib")))]
{
use jrsonnet_parser::Source;
crates/jrsonnet-stdlib/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/lib.rs
+++ b/crates/jrsonnet-stdlib/src/lib.rs
@@ -1,9 +1,15 @@
+#![allow(clippy::similar_names)]
+
use std::{
cell::{Ref, RefCell, RefMut},
collections::HashMap,
rc::Rc,
};
+pub use arrays::*;
+pub use compat::*;
+pub use encoding::*;
+pub use hash::*;
use jrsonnet_evaluator::{
error::{ErrorKind::*, Result},
function::{CallLocation, FuncVal, TlaArg},
@@ -13,40 +19,37 @@
};
use jrsonnet_gcmodule::Trace;
use jrsonnet_parser::Source;
-
-mod expr;
-mod types;
-pub use types::*;
-mod arrays;
-pub use arrays::*;
-mod math;
+pub use manifest::*;
pub use math::*;
-mod operator;
+pub use misc::*;
+pub use objects::*;
pub use operator::*;
-mod sort;
+pub use parse::*;
+pub use sets::*;
pub use sort::*;
-mod hash;
-pub use hash::*;
+pub use strings::*;
+pub use types::*;
+
+#[cfg(feature = "exp-regex")]
+pub use crate::regex::*;
+
+mod arrays;
+mod compat;
mod encoding;
-pub use encoding::*;
+mod expr;
+mod hash;
+mod manifest;
+mod math;
+mod misc;
mod objects;
-pub use objects::*;
-mod manifest;
-pub use manifest::*;
+mod operator;
mod parse;
-pub use parse::*;
-mod strings;
-pub use strings::*;
-mod misc;
-pub use misc::*;
-mod sets;
-pub use sets::*;
-mod compat;
-pub use compat::*;
#[cfg(feature = "exp-regex")]
mod regex;
-#[cfg(feature = "exp-regex")]
-pub use crate::regex::*;
+mod sets;
+mod sort;
+mod strings;
+mod types;
#[allow(clippy::too_many_lines)]
pub fn stdlib_uncached(settings: Rc<RefCell<Settings>>) -> ObjValue {
@@ -244,9 +247,7 @@
);
builder.method(
"regexGlobalReplace",
- builtin_regex_global_replace {
- cache: regex_cache.clone(),
- },
+ builtin_regex_global_replace { cache: regex_cache },
);
};
@@ -395,16 +396,15 @@
}
#[cfg(feature = "legacy-this-file")]
fn populate(&self, source: Source, builder: &mut ContextBuilder) {
- use jrsonnet_evaluator::val::StrValue;
-
let mut std = ObjValueBuilder::new();
std.with_super(self.stdlib_obj.clone());
- std.field("thisFile")
- .hide()
- .value(match source.source_path().path() {
- Some(p) => self.settings().path_resolver.resolve(p),
- None => source.source_path().to_string(),
- });
+ std.field("thisFile").hide().value({
+ let source_path = source.source_path();
+ source_path.path().map_or_else(
+ || source_path.to_string(),
+ |p| self.settings().path_resolver.resolve(p),
+ )
+ });
let stdlib_with_this_file = std.build();
builder.bind("std", Thunk::evaluated(Val::Obj(stdlib_with_this_file)));
crates/jrsonnet-stdlib/src/regex.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/regex.rs
+++ b/crates/jrsonnet-stdlib/src/regex.rs
@@ -50,16 +50,16 @@
for ele in captured.iter().skip(1) {
if let Some(ele) = ele {
- captures.push(Val::Str(StrValue::Flat(ele.as_str().into())))
+ captures.push(Val::Str(StrValue::Flat(ele.as_str().into())));
} else {
- captures.push(Val::Str(StrValue::Flat(IStr::empty())))
+ captures.push(Val::Str(StrValue::Flat(IStr::empty())));
}
}
for (i, name) in regex
.capture_names()
.skip(1)
.enumerate()
- .flat_map(|(i, v)| Some((i, v?)))
+ .filter_map(|(i, v)| Some((i, v?)))
{
let capture = captures[i].clone();
named_captures.field(name).try_value(capture)?;
flake.lockdiffbeforeafterboth--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
]
},
"locked": {
- "lastModified": 1711299236,
- "narHash": "sha256-6/JsyozOMKN8LUGqWMopKTSiK8N79T8Q+hcxu2KkTXg=",
+ "lastModified": 1714536327,
+ "narHash": "sha256-zu4+LcygJwdyFHunTMeDFltBZ9+hoWvR/1A7IEy7ChA=",
"owner": "ipetkov",
"repo": "crane",
- "rev": "880573f80d09e18a11713f402b9e6172a085449f",
+ "rev": "3124551aebd8db15d4560716d4f903bd44c64e4a",
"type": "github"
},
"original": {
@@ -25,11 +25,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1705309234,
- "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+ "lastModified": 1710146030,
+ "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+ "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
@@ -40,11 +40,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1705391267,
- "narHash": "sha256-gGVm9QudiRtYTX8PN9cTTy7uuJcL4I2lRMoPx496kXk=",
+ "lastModified": 1714595735,
+ "narHash": "sha256-8MDOiHrg2mOylcC7wpx1U1mk9V5VranG7wKyenhHnic=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "41a9a7f170c740acb24f3390323877d11c69d5ee",
+ "rev": "9d7a1659bc5c6be24ac46407b91807c6e3e0227d",
"type": "github"
},
"original": {
@@ -71,11 +71,11 @@
]
},
"locked": {
- "lastModified": 1705371439,
- "narHash": "sha256-P1kulUXpYWkcrjiX3sV4j8ACJZh9XXSaaD+jDLBDLKo=",
+ "lastModified": 1714529851,
+ "narHash": "sha256-YMKJW880f7LHXVRzu93xa6Ek+QLECIu0IRQbXbzZe38=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "b21f3c0d5bf0f0179f5f0140e8e0cd099618bd04",
+ "rev": "9ca720fdcf7865385ae3b93ecdf65f1a64cb475e",
"type": "github"
},
"original": {
rust-toolchain.tomldiffbeforeafterboth--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
[toolchain]
-channel = "nightly-2024-01-10"
+channel = "nightly-2024-05-10"
components = ["rustfmt", "clippy", "rust-analyzer", "rust-src"]
tests/tests/golden.rsdiffbeforeafterboth--- a/tests/tests/golden.rs
+++ b/tests/tests/golden.rs
@@ -27,11 +27,7 @@
Ok(v) => v,
Err(e) => return trace_format.format(&e).unwrap(),
};
- match v.manifest(
- JsonFormat::default(),
- #[cfg(feature = "exp-preserve-order")]
- false,
- ) {
+ match v.manifest(JsonFormat::default()) {
Ok(v) => v.to_string(),
Err(e) => trace_format.format(&e).unwrap(),
}
xtask/src/sourcegen/ast.rsdiffbeforeafterboth--- a/xtask/src/sourcegen/ast.rs
+++ b/xtask/src/sourcegen/ast.rs
@@ -62,6 +62,7 @@
#[derive(Debug, Clone)]
pub struct AstTokenEnumSrc {
+ #[allow(dead_code)]
pub doc: Vec<String>,
pub name: String,
pub variants: Vec<String>,
xtask/src/sourcegen/kinds.rsdiffbeforeafterboth--- a/xtask/src/sourcegen/kinds.rs
+++ b/xtask/src/sourcegen/kinds.rs
@@ -14,6 +14,7 @@
Error {
grammar_name: String,
name: String,
+ #[allow(dead_code)]
/// Is this error returned by lexer directly, or from lex.rs
is_lexer_error: bool,
regex: Option<String>,