Skip to content

Commit 6c6b39f

Browse files
committed
Updating CI
1 parent a0dad18 commit 6c6b39f

File tree

5 files changed

+28
-56
lines changed

5 files changed

+28
-56
lines changed

.github/workflows/ci.yml

+26-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
on:
22
push:
3-
branches: [ staging, trying, master ]
3+
branches: [ master ]
44
pull_request:
5+
branches: [ master ]
56

67
name: Continuous integration
78

@@ -30,19 +31,32 @@ jobs:
3031
TARGET: x86_64-unknown-linux-gnu
3132

3233
steps:
33-
- uses: actions/checkout@v2
34-
- uses: actions-rs/toolchain@v1
34+
- uses: actions/checkout@v4
35+
36+
- uses: dtolnay/rust-toolchain@stable
3537
with:
36-
profile: minimal
3738
toolchain: ${{ matrix.rust }}
3839
target: ${{ matrix.TARGET }}
39-
override: true
40-
- uses: actions-rs/cargo@v1
41-
with:
42-
command: build
43-
args: --target=${{ matrix.TARGET }}
44-
- uses: actions-rs/cargo@v1
40+
41+
- run: cargo build --target=${{ matrix.TARGET }}
42+
43+
- run: cargo test --target=${{ matrix.TARGET }} --all-features
4544
if: ${{ contains(matrix.TARGET, 'x86_64') }}
45+
46+
clippy:
47+
runs-on: ubuntu-latest
48+
steps:
49+
- uses: actions/checkout@v4
50+
- uses: dtolnay/rust-toolchain@stable
4651
with:
47-
command: test
48-
args: --target=${{ matrix.TARGET }} --all-features
52+
components: clippy
53+
54+
- run: cargo clippy
55+
56+
fmt:
57+
name: Rustfmt
58+
runs-on: ubuntu-latest
59+
steps:
60+
- uses: actions/checkout@v4
61+
- uses: dtolnay/rust-toolchain@stable
62+
- run: cargo fmt --all -- --check

.github/workflows/clippy.yml

-20
This file was deleted.

.github/workflows/rustfmt.yml

-23
This file was deleted.

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1212
- Support for optional package `defmt` which allows for easy conversion for
1313
error types when using tools like `probe-rs` for logging over debuggers.
1414
- Implement `Serializer::collect_str`
15+
- Derive `Serialize` for `de::Error` and `ser::Error`
1516

1617
### Changed
1718

src/ser/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ use core::mem::MaybeUninit;
44
use core::{fmt, str};
55

66
use serde::ser;
7-
use serde::Serialize;
87
use serde::ser::SerializeStruct as _;
8+
use serde::Serialize;
99

1010
#[cfg(feature = "heapless")]
1111
use heapless::{String, Vec};

0 commit comments

Comments
 (0)