Skip to content

Commit ceb68f3

Browse files
committed
chore: fix clippy issues
1 parent 8fbaf9f commit ceb68f3

3 files changed

Lines changed: 9 additions & 31 deletions

File tree

litehtml-sys/build.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use std::env;
2-
use std::path::PathBuf;
2+
use std::path::{Path, PathBuf};
33

44
fn main() {
55
let manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
@@ -20,7 +20,7 @@ fn main() {
2020
}
2121

2222
/// Build from vendored C++ source in vendor/litehtml
23-
fn build_vendored(manifest_dir: &PathBuf, out_dir: &PathBuf, csrc_dir: &PathBuf) {
23+
fn build_vendored(manifest_dir: &Path, out_dir: &Path, csrc_dir: &Path) {
2424
let vendor_dir = manifest_dir.join("vendor/litehtml");
2525
let gumbo_src = vendor_dir.join("src/gumbo");
2626
let gumbo_include = gumbo_src.join("include");
@@ -154,7 +154,7 @@ fn build_vendored(manifest_dir: &PathBuf, out_dir: &PathBuf, csrc_dir: &PathBuf)
154154
}
155155

156156
/// Build against system-installed litehtml
157-
fn build_system(out_dir: &PathBuf, csrc_dir: &PathBuf) {
157+
fn build_system(out_dir: &Path, csrc_dir: &Path) {
158158
// Find system litehtml via LITEHTML_DIR or common paths
159159
let litehtml_dir = env::var("LITEHTML_DIR").ok().map(PathBuf::from);
160160

@@ -238,12 +238,7 @@ fn find_library(name: &str) -> Option<PathBuf> {
238238
None
239239
}
240240

241-
fn generate_bindings(
242-
csrc_dir: &PathBuf,
243-
out_dir: &PathBuf,
244-
vendored: bool,
245-
manifest_dir: &PathBuf,
246-
) {
241+
fn generate_bindings(csrc_dir: &Path, out_dir: &Path, vendored: bool, manifest_dir: &Path) {
247242
let mut builder = bindgen::Builder::default()
248243
.header(csrc_dir.join("litehtml_c.h").to_str().unwrap())
249244
.allowlist_function("lh_.*")

litehtml/src/lib.rs

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ impl Default for Border {
136136
}
137137
}
138138

139-
#[derive(Debug, Clone, Copy, PartialEq)]
139+
#[derive(Debug, Clone, Copy, Default, PartialEq)]
140140
pub struct Borders {
141141
pub left: Border,
142142
pub top: Border,
@@ -145,18 +145,6 @@ pub struct Borders {
145145
pub radius: BorderRadiuses,
146146
}
147147

148-
impl Default for Borders {
149-
fn default() -> Self {
150-
Self {
151-
left: Border::default(),
152-
top: Border::default(),
153-
right: Border::default(),
154-
bottom: Border::default(),
155-
radius: BorderRadiuses::default(),
156-
}
157-
}
158-
}
159-
160148
#[derive(Debug, Clone, Copy, Default, PartialEq)]
161149
pub struct MediaFeatures {
162150
pub media_type: MediaType,
@@ -593,19 +581,14 @@ impl TextDecorationStyle {
593581
}
594582

595583
/// CSS `text-decoration-thickness` computed value.
596-
#[derive(Debug, Clone, Copy, PartialEq)]
584+
#[derive(Debug, Clone, Copy, Default, PartialEq)]
597585
pub enum DecorationThickness {
586+
#[default]
598587
Auto,
599588
FromFont,
600589
Length(f32),
601590
}
602591

603-
impl Default for DecorationThickness {
604-
fn default() -> Self {
605-
Self::Auto
606-
}
607-
}
608-
609592
// ---------------------------------------------------------------------------
610593
// Opaque pointer wrappers (borrowed, read-only)
611594
// ---------------------------------------------------------------------------
@@ -1343,7 +1326,7 @@ unsafe extern "C" fn cb_get_default_font_name(user_data: *mut c_void) -> *const
13431326
let bridge = bridge_from_user_data(user_data);
13441327
bridge.default_font_name.as_ptr()
13451328
}))
1346-
.unwrap_or(b"serif\0".as_ptr().cast::<c_char>())
1329+
.unwrap_or(c"serif".as_ptr())
13471330
}
13481331

13491332
unsafe extern "C" fn cb_draw_list_marker(

litehtml/src/selection.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ impl<'doc> Selection<'doc> {
212212
let needs_update = self
213213
.order_cache
214214
.as_ref()
215-
.map_or(true, |c| c.a != start.element || c.b != end.element);
215+
.is_none_or(|c| c.a != start.element || c.b != end.element);
216216
if needs_update {
217217
let a_before_b = is_before(&start.element(), &end.element());
218218
self.order_cache = Some(OrderCache {

0 commit comments

Comments
 (0)