Skip to content

Commit

Permalink
Merge pull request #8 from GnomedDev/reduce-msrv
Browse files Browse the repository at this point in the history
Reduce MSRV to 1.53
  • Loading branch information
danielhenrymantilla authored Jul 8, 2022
2 parents 279ec40 + 1f87ccf commit 4732438
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 16 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ on:
jobs:
# == CHECK == #
check:
name: "Check beta stable and MSRV=1.57.0"
name: "Check beta stable and MSRV=1.53.0"
runs-on: ubuntu-latest
strategy:
matrix:
rust-toolchains:
- 1.57.0
- 1.53.0
- stable
- beta
cargo-locked: ["--locked", ""]
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
- macos-latest
- windows-latest
rust-toolchains:
- 1.57.0
- 1.53.0
- stable
steps:
- name: Install Rust toolchain
Expand All @@ -67,6 +67,10 @@ jobs:

- name: Cargo test
uses: actions-rs/cargo@v1
env:
RUSTDOCFLAGS: '-Zcrate-attr=feature(macro_attributes_in_derive_output)'
RUSTFLAGS: '-Zcrate-attr=feature(macro_attributes_in_derive_output)'
RUSTC_BOOTSTRAP: '1'
with:
command: test

Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/future-proof.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- macos-latest
- windows-latest
rust-toolchains:
- 1.57.0
- 1.53.0
- stable
- beta
- nightly
Expand All @@ -43,12 +43,16 @@ jobs:

- name: Cargo test
uses: actions-rs/cargo@v1
env:
RUSTDOCFLAGS: '-Zcrate-attr=feature(macro_attributes_in_derive_output)'
RUSTFLAGS: '-Zcrate-attr=feature(macro_attributes_in_derive_output)'
RUSTC_BOOTSTRAP: '1'
with:
command: test
args: ${{ matrix.cargo-locked }}

# - name: Cargo test (embed `README.md` + UI)
# if: matrix.rust-toolchains != '1.57.0'
# if: matrix.rust-toolchains != '1.53.0'
# uses: actions-rs/cargo@v1
# with:
# command: test-ui
4 changes: 2 additions & 2 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
name = "macro_rules_attribute"
version = "0.1.1" # Keep in sync
version = "0.1.2" # Keep in sync
authors = ["Daniel Henry-Mantilla <daniel.henry.mantilla@gmail.com>"]
edition = "2021"
edition = "2018"

documentation = "https://docs.rs/macro_rules_attribute"
homepage = "https://crates.io/crates/macro_rules_attribute"
Expand All @@ -19,7 +19,7 @@ readme = "README.md"
paste.version = "1.0.7"

[dependencies.macro_rules_attribute-proc_macro]
version = "0.1.1" # Keep in sync
version = "0.1.2" # Keep in sync
path = "src/proc_macro"

[features]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ https://github.com/danielhenrymantilla/macro_rules_attribute-rs)
https://crates.io/crates/macro_rules_attribute)
[![Documentation](https://docs.rs/macro_rules_attribute/badge.svg)](
https://docs.rs/macro_rules_attribute)
[![MSRV](https://img.shields.io/badge/MSRV-1.57.0-white)](
[![MSRV](https://img.shields.io/badge/MSRV-1.53.0-white)](
https://gist.github.com/danielhenrymantilla/8e5b721b3929084562f8f65668920c33)
[![unsafe forbidden](https://img.shields.io/badge/unsafe-forbidden-success.svg)](
https://github.com/rust-secure-code/safety-dance/)
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = '1.57.0'
channel = '1.53.0'
# Templated by `cargo-generate` using https://github.com/danielhenrymantilla/proc-macro-template
6 changes: 4 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
[`macro_rules_attribute`]: macro_rules_attribute
[`macro_rules_derive`]: macro_rules_derive
*/
#![doc = include_str!("../README.md")]
#![cfg_attr(feature = "better-docs",
cfg_attr(all(), doc = include_str!("../README.md"))
)]
#![cfg_attr(feature = "better-docs",
feature(doc_auto_cfg),
)]
Expand Down Expand Up @@ -489,7 +491,7 @@ macro_rules! ඞ_with_dollar {( $($rules:tt)* ) => (
)}

/// Like <code>#\[[macro_rules_derive]\]</code>, but for allowing to be
/// used to shadow [the "built-in" `#[derive]` attribute][1].
/// used to shadow [the "built-in" `#[derive]` attribute][1] (on Rust ≥ 1.57.0).
///
/// [1]: https://doc.rust-lang.org/stable/core/prelude/v1/macro.derive.html
///
Expand Down
4 changes: 2 additions & 2 deletions src/proc_macro/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ path = "mod.rs"

[package]
name = "macro_rules_attribute-proc_macro"
version = "0.1.1" # Keep in sync
version = "0.1.2" # Keep in sync
authors = ["Daniel Henry-Mantilla <daniel.henry.mantilla@gmail.com>"]
edition = "2021"
edition = "2018"

description = "Use declarative macros as proc_macro attributes or derives"
license = "MIT"
Expand Down
1 change: 1 addition & 0 deletions src/proc_macro/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
use {
::core::{
ops::Not as _,
iter::FromIterator as _,
},
::proc_macro::{*,
TokenTree as TT,
Expand Down

0 comments on commit 4732438

Please sign in to comment.