Skip to content
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

Parse misuse resistance #191

Draft
wants to merge 16 commits into
base: main
Choose a base branch
from
Draft

Parse misuse resistance #191

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
dacfd24
clippy
sftse Dec 10, 2024
52055fb
Express fn parse_with_context() with the help of fn parse_html()
sftse Dec 10, 2024
b29ec27
Express configs with default constructor fn with_decorator
sftse Dec 10, 2024
cfdadd9
Derive PartialEq, Eq impls
sftse Dec 10, 2024
0019a6a
Express fn from_read_coloured() with fn coloured()
sftse Dec 10, 2024
c5b106d
Construct context inside do_parse to make obvious it isnt used to com…
sftse Dec 10, 2024
64b1ac8
Express functions consistently with pub API functions when available
sftse Dec 12, 2024
f251236
Remove fn render as it is only used in tests
sftse Dec 12, 2024
e7aa74e
Express HtmlContext::default() as config::plain().make_context()
sftse Dec 12, 2024
436dea4
Express fn parse() with fn do_parse()
sftse Dec 16, 2024
dd17579
Inline parse_with_context into callsites
sftse Dec 12, 2024
2eb8f25
Express do_parse using dom_to_render_tree
sftse Dec 12, 2024
0c0cf62
Use the config instead of plain(), this is more obvious although equi…
sftse Dec 13, 2024
e9786ac
tests: use higher-level functions to express tests in equivalent way
sftse Dec 16, 2024
f0f7bd1
Less indexing, less unwraps
sftse Dec 16, 2024
fbaf8b3
Remove fn parse() from public API and replace with pub fn do_parse() …
sftse Dec 12, 2024
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
Derive PartialEq, Eq impls
  • Loading branch information
@sftse
sftse committed Dec 12, 2024
commit cfdadd9265b84e3d6d4b0be6b384c20e3e316b41
14 changes: 7 additions & 7 deletions src/css.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use crate::{

use self::parser::Importance;

#[derive(Debug, Clone, PartialEq)]
#[derive(Debug, Clone, PartialEq, Eq)]
pub(crate) enum SelectorComponent {
Class(String),
Element(String),
Expand Down Expand Up @@ -46,7 +46,7 @@ impl std::fmt::Display for SelectorComponent {
}
}

#[derive(Debug, Clone, PartialEq)]
#[derive(Debug, Clone, PartialEq, Eq)]
pub(crate) struct Selector {
// List of components, right first so we match from the leaf.
components: Vec<SelectorComponent>,
Expand Down Expand Up @@ -189,7 +189,7 @@ impl Selector {
}
}

#[derive(Debug, Clone, Copy)]
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub(crate) enum Display {
/// display: none
None,
Expand All @@ -198,15 +198,15 @@ pub(crate) enum Display {
ExtRawDom,
}

#[derive(Debug, Clone)]
#[derive(Debug, Clone, PartialEq, Eq)]
pub(crate) enum Style {
Colour(Colour),
BgColour(Colour),
Display(Display),
WhiteSpace(WhiteSpace),
}

#[derive(Debug, Clone)]
#[derive(Debug, Clone, PartialEq, Eq)]
pub(crate) struct StyleDecl {
style: Style,
importance: Importance,
Expand All @@ -230,7 +230,7 @@ impl std::fmt::Display for StyleDecl {
}
}

#[derive(Debug, Clone)]
#[derive(Debug, Clone, PartialEq, Eq)]
struct Ruleset {
selector: Selector,
styles: Vec<StyleDecl>,
Expand All @@ -248,7 +248,7 @@ impl std::fmt::Display for Ruleset {
}

/// Stylesheet data which can be used while building the render tree.
#[derive(Clone, Default, Debug)]
#[derive(Clone, Default, Debug, PartialEq, Eq)]
pub(crate) struct StyleData {
agent_rules: Vec<Ruleset>,
user_rules: Vec<Ruleset>,
Expand Down
4 changes: 2 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ use std::io;
use std::io::Write;
use std::iter::{once, repeat};

#[derive(Debug, Copy, Clone, Default, PartialEq)]
#[derive(Debug, Copy, Clone, Default, PartialEq, Eq)]
pub(crate) enum WhiteSpace {
#[default]
Normal,
Expand Down Expand Up @@ -1306,7 +1306,7 @@ where
}
}

#[derive(Default, Debug)]
#[derive(Default, Debug, PartialEq, Eq)]
struct HtmlContext {
#[cfg(feature = "css")]
style_data: css::StyleData,
Expand Down