Skip to content

Commit 6fd4f89

Browse files
committed
build cleanly with nightly Rust 2021-03-14+
The CI nightly builds had been broken with the following error: ``` error: custom inner attributes are unstable --> /home/runner/work/moonfire-nvr/moonfire-nvr/server/target/debug/build/moonfire-db-415ce696a754c614/out/schema.rs:10:4 | 10 | #![rustfmt::skip] | ^^^^^^^^^^^^^ | = note: `#[deny(soft_unstable)]` on by default = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release! = note: for more information, see issue #64266 <rust-lang/rust#64266> ``` I'd thought this was by mistake given that #[rustfmt::skip] is still advertised on rustfmt's github page, but maybe not. Looks like rust-protobuf's newest version uses `#![cfg_attr(rustfmt, rustfmt::skip)]` to avoid this error. Also fix a warning on nightly about an extraneous semicolon.
1 parent abcd650 commit 6fd4f89

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ changes, see Git history.
66
Each release is tagged in Git and on the Docker repository
77
[`scottlamb/moonfire-nvr`](https://hub.docker.com/r/scottlamb/moonfire-nvr).
88

9+
## `v0.6.3` (in progress)
10+
11+
* Compile fix for nightly rust 2021-03-14 and beyond.
12+
913
## `v0.6.2`
1014

1115
* Fix panics when a stream's PTS has extreme jumps

server/Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/src/mp4.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1336,7 +1336,7 @@ impl FileBuilder {
13361336
struct Entry {
13371337
segment_duration: u64,
13381338
media_time: u64,
1339-
};
1339+
}
13401340
let mut flushed: Vec<Entry> = Vec::new();
13411341
let mut unflushed: Entry = Default::default();
13421342
let mut cur_media_time: u64 = 0;

0 commit comments

Comments
 (0)