Skip to content

Commit 5042d8d

Browse files
bors[bot]mpi3d
andauthored
Merge #70
70: Fix LineEvent timestamp doc r=eldruin a=mpi3d Fix documentation on `LineEvent::timestamp()`. According to the Linux documentation, the timestamp is `CLOCK_MONOTONIC` by default: [gpio.h#L286](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/linux/gpio.h#n286). Please see [#68 comment](#68 (comment)). Co-authored-by: Matthieu CHARETTE <[email protected]>
2 parents 2c7ef82 + eb00492 commit 5042d8d

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

.github/bors.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ status = [
1717
"build (stable, x86_64-unknown-linux-gnu)",
1818
"build (stable, x86_64-unknown-linux-musl)",
1919

20-
"build (1.46.0, x86_64-unknown-linux-gnu)",
20+
"build (1.56.0, x86_64-unknown-linux-gnu)",
2121

2222
"checks"
2323
]

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
include:
3535
# MSRV
36-
- rust: 1.46.0
36+
- rust: 1.56.0
3737
TARGET: x86_64-unknown-linux-gnu
3838

3939
# Test nightly but don't fail
@@ -107,7 +107,7 @@ jobs:
107107
- uses: actions-rs/toolchain@v1
108108
with:
109109
profile: minimal
110-
toolchain: 1.46.0
110+
toolchain: 1.56.0
111111
components: clippy
112112

113113
- uses: actions-rs/clippy-check@v1

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Versioning](https://semver.org/spec/v2.0.0.html).
88

99
## [Unreleased]
1010

11+
- MSRV is now 1.56.0.
1112

1213
## [v0.5.1] - 2021-11-22
1314

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ to be considered reliable.
206206

207207
## Minimum Supported Rust Version (MSRV)
208208

209-
This crate is guaranteed to compile on stable Rust 1.46.0 and up. It *might*
209+
This crate is guaranteed to compile on stable Rust 1.56.0 and up. It *might*
210210
compile with older versions but that may change in any new patch release.
211211

212212
## License

src/lib.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -920,8 +920,10 @@ impl LineEvent {
920920
/// in an interrupt handler so it should be very accurate.
921921
///
922922
/// The nanosecond timestamp value should are captured
923-
/// using the `CLOCK_REALTIME` offsets in the kernel and
924-
/// should be compared against `CLOCK_REALTIME` values.
923+
/// using the `CLOCK_MONOTONIC` offsets in the kernel and
924+
/// should be compared against `CLOCK_MONOTONIC` values.
925+
/// Note that kernel versions prior to 5.7 used
926+
/// `CLOCK_REALTIME` offsets instead.
925927
pub fn timestamp(&self) -> u64 {
926928
self.0.timestamp
927929
}

0 commit comments

Comments
 (0)