fork of https://github.com/tree-sitter/tree-sitter-graph

Merge pull request #147 from tree-sitter/dependency-version-cleanup

authored by Hendrik van Antwerpen and committed by GitHub 6712584c 70ba65ca

Changed files
+31 -55
.github
workflows
src
+10 -10
.github/workflows/ci.yml
··· 19 19 uses: hecrj/setup-rust-action@v1 20 20 with: 21 21 rust-version: ${{ matrix.rust }} 22 + - name: Install Cargo plugins 23 + run: | 24 + rustup toolchain install nightly 25 + cargo install cargo-hack cargo-minimal-versions 22 26 - name: Checkout code 23 27 uses: actions/checkout@v2 24 28 - name: Check formatting ··· 33 37 key: ${{ runner.OS }}-cargo-${{ hashFiles('**/Cargo.lock') }} 34 38 restore-keys: | 35 39 ${{ runner.OS }}-cargo- 36 - - name: Build library (default features) 37 - run: cargo build 38 - - name: Test library (default features) 39 - run: cargo test 40 - - name: Build library (all features) 41 - run: cargo build --all-features 42 - - name: Test library (all features) 43 - run: cargo test --all-features 44 - - name: Build program 45 - run: cargo build --bin tree-sitter-graph --features=cli 40 + - name: Build library (all feature combinations) 41 + run: cargo hack --feature-powerset --no-dev-deps build 42 + - name: Test library (all feature combinations) 43 + run: cargo hack --feature-powerset test 44 + - name: Build library (minimal versions) 45 + run: cargo minimal-versions build
+19 -43
Cargo.toml
··· 15 15 # All of our tests are in the tests/it "integration" test executable. 16 16 test = false 17 17 18 - [dependencies] 19 - log = "0.4" 20 - regex = "1" 21 - serde = "1.0" 22 - serde_json = "1.0" 23 - smallvec = { version="1.6", features=["union"] } 24 - thiserror = "1.0" 25 - tree-sitter = "0.20" 26 - 27 - [dependencies.string-interner] 28 - version = "0.12" 29 - default-features = false 30 - features = ["std", "inline-more", "backends"] 31 - 32 - [dev-dependencies] 33 - env_logger = "0.9" 34 - indoc = "1.0" 35 - tree-sitter-python = "0.19.1" 36 - 37 - # cli-only dependencies below 38 - 39 18 [[bin]] 40 19 name = "tree-sitter-graph" 41 20 required-features = ["cli"] ··· 44 23 cli = ["anyhow", "clap", "env_logger", "term-colors", "tree-sitter-config", "tree-sitter-loader"] 45 24 term-colors = ["colored"] 46 25 47 - [dependencies.anyhow] 48 - optional = true 49 - version = "1.0" 50 - 51 - [dependencies.clap] 52 - optional = true 53 - version = "3.2" 54 - 55 - [dependencies.colored] 56 - optional = true 57 - version = "2" 26 + [dependencies] 27 + anyhow = { version = "1.0", optional = true } 28 + clap = { version = "3.2", optional = true } 29 + colored = { version = "2", optional = true } 30 + env_logger = { version = "0.9", optional = true } 31 + log = "0.4" 32 + regex = "1.3.2" 33 + serde = "1.0" 34 + serde_json = "1.0" 35 + smallvec = { version="1.6", features=["union"] } 36 + string-interner = { version = "0.12", default-features = false, features = ["std", "inline-more", "backends"] } 37 + thiserror = "1.0.7" 38 + tree-sitter = "0.20.3" 39 + tree-sitter-config = { version = "0.19", optional = true } 40 + tree-sitter-loader = { version = "0.20", optional = true } 58 41 59 - [dependencies.env_logger] 60 - optional = true 61 - version = "0.9" 62 - 63 - [dependencies.tree-sitter-config] 64 - optional = true 65 - version = "0.19" 66 - 67 - [dependencies.tree-sitter-loader] 68 - optional = true 69 - version = "0.19" 42 + [dev-dependencies] 43 + env_logger = "0.9" 44 + indoc = "1.0" 45 + tree-sitter-python = "0.20"
+1 -1
src/functions.rs
··· 575 575 let replacement = parameters.param()?.into_string()?; 576 576 parameters.finish()?; 577 577 Ok(Value::String( 578 - pattern.replace_all(&text, replacement).to_string(), 578 + pattern.replace_all(&text, replacement.as_str()).to_string(), 579 579 )) 580 580 } 581 581 }
+1 -1
src/variables.rs
··· 104 104 v.into_key().to_string(), 105 105 ))), 106 106 Occupied(mut o) => { 107 - let mut variable = o.get_mut(); 107 + let variable = o.get_mut(); 108 108 if variable.mutable { 109 109 variable.value = value; 110 110 Ok(())