Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
strategy:
fail-fast: false
matrix:
rust: ['1.82.0', stable, nightly]
rust: ['1.68.0', stable, nightly]
os: [ubuntu-latest, macOS-latest]

steps:
Expand Down
2 changes: 1 addition & 1 deletion bin/cargo-bolero/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ keywords = ["testing", "quickcheck", "property", "fuzz", "fuzzing"]
license = "MIT"
edition = "2021"
readme = "README.md"
rust-version = "1.82.0"
rust-version = "1.76.0"

[features]
default = ["afl", "libfuzzer", "kani"]
Expand Down
2 changes: 1 addition & 1 deletion bin/cargo-bolero/src/project.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ impl Project {
// https://github.com/rust-lang/rust/pull/88243

let is_rust_159 = version_meta.semver.major == 1 && version_meta.semver.minor >= 59;
let is_llvm_13 = version_meta.llvm_version.is_none_or(|v| v.major >= 13);
let is_llvm_13 = version_meta.llvm_version.map_or(true, |v| v.major >= 13);

Some(if is_rust_159 && is_llvm_13 {
&"-Cpasses=sancov-module"
Expand Down
2 changes: 1 addition & 1 deletion bin/clippy.toml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
msrv = "1.82.0"
msrv = "1.76.0"
2 changes: 1 addition & 1 deletion bin/rust-toolchain
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.82.0"
channel = "1.76.0"
components = [ "rustc", "clippy", "rustfmt" ]
2 changes: 1 addition & 1 deletion clippy.toml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
msrv = "1.82.0"
msrv = "1.68.0"
2 changes: 1 addition & 1 deletion lib/bolero-engine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ keywords = ["testing", "quickcheck", "property", "fuzz", "fuzzing"]
license = "MIT"
edition = "2021"
readme = "../../README.md"
rust-version = "1.82.0"
rust-version = "1.68.0"

[features]
any = ["bolero-generator/any"]
Expand Down
4 changes: 3 additions & 1 deletion lib/bolero-generator-derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ readme = "../bolero-generator/README.md"
proc-macro = true

[dependencies]
proc-macro-crate = "3"
proc-macro-crate = "2"
proc-macro2 = "1"
quote = "1"
# The `full` feature is required to correctly parse attributes
# TODO investigate if this can be reduced in scope
syn = { version = "2", features = ["full"] }
# Pin transitive MSRV bump (pulled via proc-macro-crate -> toml_edit -> indexmap)
indexmap = "=2.11.2"
2 changes: 2 additions & 0 deletions lib/bolero-generator-derive/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ extern crate proc_macro;

mod generator_attr;

// Ensure the pinned dependency is considered "used" (avoids unused-deps lint in CI).
use generator_attr::GeneratorAttr;
use indexmap as _;
use proc_macro::TokenStream;
use proc_macro2::{Span, TokenStream as TokenStream2};
use proc_macro_crate::{crate_name, FoundCrate};
Expand Down
2 changes: 1 addition & 1 deletion lib/bolero-generator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ keywords = ["testing", "quickcheck", "property", "fuzz", "fuzzing"]
license = "MIT"
edition = "2021"
readme = "README.md"
rust-version = "1.82.0"
rust-version = "1.68.0"

[features]
default = ["any", "either", "std"]
Expand Down
2 changes: 1 addition & 1 deletion lib/bolero/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ keywords = ["testing", "quickcheck", "property", "fuzz", "fuzzing"]
license = "MIT"
edition = "2021"
readme = "../../README.md"
rust-version = "1.82.0"
rust-version = "1.68.0"

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion lib/clippy.toml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
msrv = "1.82.0"
msrv = "1.68.0"
2 changes: 1 addition & 1 deletion lib/rust-toolchain
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.82.0"
channel = "1.68.0"
components = [ "rustc", "clippy", "rustfmt" ]
2 changes: 1 addition & 1 deletion tests/src/bolero.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use xshell::{cmd, Shell};
pub fn test() -> Result {
let rust_version = env::rustc();

let supports_arbitrary = rust_version.is_none_or(|v| v.major > 1 && v.minor >= 63);
let supports_arbitrary = rust_version.map_or(true, |v| v.major > 1 && v.minor >= 63);

Test { supports_arbitrary }.run()?;

Expand Down
2 changes: 1 addition & 1 deletion tests/src/cargo_bolero.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use xshell::{cmd, Shell};
pub fn test() -> Result {
let rust_version = env::rustc();

let use_stable = rust_version.is_some_and(|v| v.major > 1 && v.minor <= 65);
let use_stable = rust_version.map_or(false, |v| v.major > 1 && v.minor <= 65);

Test { use_stable }.run()?;

Expand Down
2 changes: 1 addition & 1 deletion tests/src/engines.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::{env, Result};
use xshell::{cmd, Shell};

pub fn test() -> Result {
let is_nightly = env::rustc_build().is_some_and(|b| b == "nightly");
let is_nightly = env::rustc_build().map_or(false, |b| b == "nightly");

for engine in ["random", "libfuzzer", "afl", "honggfuzz", "kani"] {
// TODO fix honggfuzz
Expand Down
2 changes: 1 addition & 1 deletion tests/src/reduce.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::{fs, path::PathBuf};
use xshell::{cmd, Shell};

pub fn test() -> Result {
let is_nightly = env::rustc_build().is_some_and(|b| b == "nightly");
let is_nightly = env::rustc_build().map_or(false, |b| b == "nightly");

Test {
rustc_bootstrap: !is_nightly,
Expand Down
Loading