Skip to content

Avoid std::fmt in serialization code #190

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
Aug 30, 2017
Merged

Avoid std::fmt in serialization code #190

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9889d19
Remove obsolete ToCss::fmt_to_css
SimonSapin Aug 29, 2017
26c5e6d
Use the itoa crate to serialize integers.
SimonSapin Aug 29, 2017
be1ebf7
Avoid using formatting strings in color serialization
SimonSapin Aug 29, 2017
c42f384
Avoid using std::fmt string interpolation in serialization
SimonSapin Aug 29, 2017
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
Prev Previous commit
Next Next commit
Avoid using formatting strings in color serialization
  • Loading branch information
@SimonSapin
SimonSapin committed Aug 29, 2017
commit be1ebf7ee9a9668e37ae6269841763b9a7e84309
28 changes: 18 additions & 10 deletions src/color.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,18 +100,26 @@ impl ToCss for RGBA {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result
where W: fmt::Write,
{
// Try first with two decimal places, then with three.
let mut rounded_alpha = (self.alpha_f32() * 100.).round() / 100.;
if clamp_unit_f32(rounded_alpha) != self.alpha {
rounded_alpha = (self.alpha_f32() * 1000.).round() / 1000.;
}
let serialize_alpha = self.alpha != 255;

dest.write_str(if serialize_alpha { "rgba(" } else { "rgb(" })?;
self.red.to_css(dest)?;
dest.write_str(", ")?;
self.green.to_css(dest)?;
dest.write_str(", ")?;
self.blue.to_css(dest)?;
if serialize_alpha {
dest.write_str(", ")?;

// Try first with two decimal places, then with three.
let mut rounded_alpha = (self.alpha_f32() * 100.).round() / 100.;
if clamp_unit_f32(rounded_alpha) != self.alpha {
rounded_alpha = (self.alpha_f32() * 1000.).round() / 1000.;
}

if self.alpha == 255 {
write!(dest, "rgb({}, {}, {})", self.red, self.green, self.blue)
} else {
write!(dest, "rgba({}, {}, {}, {})",
self.red, self.green, self.blue, rounded_alpha)
rounded_alpha.to_css(dest)?;
}
dest.write_char(')')
}
}

Expand Down