Skip to content

Replace if cfg!(kani) by #[cfg(kani)] #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
camshaft merged 3 commits into from
May 15, 2023
Merged

Replace if cfg!(kani) by #[cfg(kani)] #148

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
626ee63
Replace `if cfg!(kani)` by `#[cfg(kani)]`
celinval May 15, 2023
186372c
Run cargo format
celinval May 15, 2023
7bfbf1b
Put Kani specific implementation in separate functions
celinval May 15, 2023
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
33 changes: 20 additions & 13 deletions bolero-engine/src/target_location.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@ pub struct TargetLocation {
}

impl TargetLocation {
#[cfg(kani)]
pub fn should_run(&self) -> bool {
Copy link
Collaborator

@zhassan-aws zhassan-aws May 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be cleaner to duplicate this function instead since there is no common code between kani and not(kani)?

Copy link
Contributor Author

@celinval celinval May 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure

if cfg!(kani) {
return true;
}
true
}

#[cfg(not(kani))]
pub fn should_run(&self) -> bool {
// cargo-bolero needs to resolve information about the target
if let Ok(mode) = ::std::env::var("CARGO_BOLERO_SELECT") {
match mode.as_str() {
Expand All @@ -41,7 +43,6 @@ impl TargetLocation {
}
return false;
}

true
}

Expand All @@ -64,11 +65,13 @@ impl TargetLocation {
);
}

#[cfg(kani)]
pub fn abs_path(&self) -> Option<PathBuf> {
Copy link
Collaborator

@zhassan-aws zhassan-aws May 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

if cfg!(kani) {
return None;
}
None
}

#[cfg(not(kani))]
pub fn abs_path(&self) -> Option<PathBuf> {
let file = Path::new(self.file);

#[cfg(not(miri))] // miri does not currently support this call
Expand All @@ -90,11 +93,13 @@ impl TargetLocation {
})
}

#[cfg(kani)]
pub fn work_dir(&self) -> Option<PathBuf> {
if cfg!(kani) {
return None;
}
None
}

#[cfg(not(kani))]
pub fn work_dir(&self) -> Option<PathBuf> {
let mut work_dir = self.abs_path()?;
work_dir.pop();

Expand All @@ -112,11 +117,13 @@ impl TargetLocation {
Some(work_dir)
}

#[cfg(kani)]
pub fn is_harnessed(&self) -> bool {
if cfg!(kani) {
return false;
}
false
}

#[cfg(not(kani))]
pub fn is_harnessed(&self) -> bool {
is_harnessed(self.item_path)
}

Expand Down