diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c624af6f5..550a6ce25 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,9 @@ jobs: steps: - uses: actions/checkout@master - name: Install Rust (rustup) - run: rustup update ${{ matrix.rust }} && rustup default ${{ matrix.rust }} + run: | + rustup update ${{ matrix.rust }} + rustup default ${{ matrix.rust }} if: matrix.os != 'macos-latest' - name: Install Rust (macos) run: | @@ -55,7 +57,10 @@ jobs: steps: - uses: actions/checkout@master - name: Install Rust - run: rustup update stable && rustup default stable && rustup component add rustfmt + run: | + rustup update stable + rustup default stable + rustup component add rustfmt - run: cargo fmt -- --check msrv: @@ -64,7 +69,9 @@ jobs: steps: - uses: actions/checkout@master - name: Install Rust - run: rustup update 1.16.0 && rustup default 1.16.0 + run: | + rustup update 1.31.0 + rustup default 1.31.0 - run: cargo build --verbose - run: cargo build --verbose --features serde - run: cargo build --verbose --features std @@ -75,6 +82,8 @@ jobs: steps: - uses: actions/checkout@master - name: Install Rust - run: rustup update stable && rustup default stable + run: | + rustup update stable + rustup default stable - run: rustup target add thumbv6m-none-eabi - run: cargo build --verbose --target=thumbv6m-none-eabi diff --git a/README.md b/README.md index e9f2573ea..399581fed 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ implementation that is most suitable for its use case. ## Minimum supported `rustc` -`1.16.0+` +`1.31.0+` This version is explicitly tested in CI and may be bumped in any release as needed. Maintaining compatibility with older compilers is a priority though, so the bar for bumping the minimum supported version is set very high. Any changes to the supported minimum version will be called out in the release notes. diff --git a/src/lib.rs b/src/lib.rs index 53fcb3c00..147e04201 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -911,28 +911,17 @@ impl<'a> RecordBuilder<'a> { /// [`Metadata::builder().build()`]: struct.MetadataBuilder.html#method.build #[inline] pub fn new() -> RecordBuilder<'a> { - #[cfg(feature = "kv_unstable")] - return RecordBuilder { + RecordBuilder { record: Record { args: format_args!(""), metadata: Metadata::builder().build(), module_path: None, file: None, line: None, + #[cfg(feature = "kv_unstable")] key_values: KeyValues(&Option::None::<(kv::Key, kv::Value)>), }, - }; - - #[cfg(not(feature = "kv_unstable"))] - return RecordBuilder { - record: Record { - args: format_args!(""), - metadata: Metadata::builder().build(), - module_path: None, - file: None, - line: None, - }, - }; + } } /// Set [`args`](struct.Record.html#method.args).