Skip to content

Fix Formatter::Prettyplease #2505

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
merged 4 commits into from
Apr 17, 2023
Merged

Fix Formatter::Prettyplease #2505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72e342e
Fix Formatter::Prettyplease
vorot93 Apr 15, 2023
c3f76ed
Update lib.rs
vorot93 Apr 17, 2023
13a5a99
Update lib.rs
vorot93 Apr 17, 2023
bd38948
Update CHANGELOG.md
pvdrz Apr 17, 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@

## Fixed

* Prettyplease is available as a `Formatter` variant now.

## Security

# 0.65.1
Expand Down
5 changes: 0 additions & 5 deletions bindgen/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ pub enum Formatter {
None,
/// Use `rustfmt` to format the bindings.
Rustfmt,
#[cfg(feature = "prettyplease")]
/// Use `prettyplease` to format the bindings.
Prettyplease,
}
Expand All @@ -189,7 +188,6 @@ impl FromStr for Formatter {
match s {
"none" => Ok(Self::None),
"rustfmt" => Ok(Self::Rustfmt),
#[cfg(feature = "prettyplease")]
"prettyplease" => Ok(Self::Prettyplease),
_ => Err(format!("`{}` is not a valid formatter", s)),
}
Expand All @@ -201,7 +199,6 @@ impl std::fmt::Display for Formatter {
let s = match self {
Self::None => "none",
Self::Rustfmt => "rustfmt",
#[cfg(feature = "prettyplease")]
Self::Prettyplease => "prettyplease",
};

Expand Down Expand Up @@ -966,8 +963,6 @@ impl Bindings {

match self.options.formatter {
Formatter::None => return Ok(tokens.to_string()),

#[cfg(feature = "prettyplease")]
Formatter::Prettyplease => {
return Ok(prettyplease::unparse(&syn::parse_quote!(#tokens)));
}
Expand Down