Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/rust-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ name: CI
jobs:
lint:
name: Lint
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
Expand All @@ -34,7 +34,7 @@ jobs:
test:
name: Test
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
Expand All @@ -46,14 +46,14 @@ jobs:

deny:
name: cargo-deny
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: EmbarkStudios/cargo-deny-action@v2

publish-check:
name: Publish Check
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
Expand All @@ -62,7 +62,7 @@ jobs:
run: cargo publish --dry-run -p toml-span

test_success:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: [lint,test,deny,publish-check]
steps:
- run: echo "All test jobs passed"
146 changes: 84 additions & 62 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ members = ["integ-tests", "toml-span"]

[workspace.package]
authors = ["Embark <[email protected]>"]
edition = "2021"
edition = "2024"
license = "MIT OR Apache-2.0"
homepage = "https://github.com/EmbarkStudios/toml-span"
repository = "https://github.com/EmbarkStudios/toml-span"
Expand Down
2 changes: 1 addition & 1 deletion deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ all-features = true
multiple-versions = "deny"

[licenses]
allow = ["MIT", "Apache-2.0"]
allow = ["MIT", "Apache-2.0", "Unicode-3.0"]
2 changes: 1 addition & 1 deletion integ-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license.workspace = true
publish = false

[dependencies]
codespan-reporting = "0.11"
codespan-reporting = "0.12"
insta = { version = "1.34", features = ["json"] }
pretty_assertions = "1.4"
toml-span = { workspace = true, features = ["reporting", "serde"] }
2 changes: 1 addition & 1 deletion integ-tests/tests/de.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

use integ_tests::{invalid_de, valid_de};
use toml_span::{
DeserError, Deserialize,
de_helpers::*,
span::Spanned,
value::{Value, ValueInner},
DeserError, Deserialize,
};

#[derive(Debug)]
Expand Down
Loading