mirror of
https://github.com/servo/servo.git
synced 2025-07-23 07:13:52 +01:00
Use strum
to iterate through enum variants and get their names (#35933)
`strum` allows us to avoid manually listing enum variant names and also to get their names as static strings. We cannot use this for all cases due to https://github.com/Peternator7/strum/issues/152, but we can still use it to remove a lot of code. Signed-off-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
parent
959720db0a
commit
294a649a6c
17 changed files with 51 additions and 285 deletions
|
@ -6,6 +6,7 @@ use std::fmt;
|
|||
|
||||
use base::id::PipelineId;
|
||||
use malloc_size_of_derive::MallocSizeOf;
|
||||
use strum_macros::VariantArray;
|
||||
use stylo_atoms::Atom;
|
||||
|
||||
use crate::dom::bindings::refcounted::Trusted;
|
||||
|
@ -19,10 +20,7 @@ use crate::task_manager::TaskManager;
|
|||
/// The names of all task sources, used to differentiate TaskCancellers. Note: When adding a task
|
||||
/// source, update this enum. Note: The HistoryTraversalTaskSource is not part of this, because it
|
||||
/// doesn't implement TaskSource.
|
||||
///
|
||||
/// Note: When adding or removing a [`TaskSourceName`], be sure to also update the return value of
|
||||
/// [`TaskSourceName::all`].
|
||||
#[derive(Clone, Copy, Debug, Eq, Hash, JSTraceable, MallocSizeOf, PartialEq)]
|
||||
#[derive(Clone, Copy, Debug, Eq, Hash, JSTraceable, MallocSizeOf, PartialEq, VariantArray)]
|
||||
pub(crate) enum TaskSourceName {
|
||||
Canvas,
|
||||
DOMManipulation,
|
||||
|
@ -68,28 +66,6 @@ impl From<TaskSourceName> for ScriptThreadEventCategory {
|
|||
}
|
||||
}
|
||||
|
||||
impl TaskSourceName {
|
||||
pub(crate) fn all() -> &'static [TaskSourceName] {
|
||||
&[
|
||||
TaskSourceName::Canvas,
|
||||
TaskSourceName::DOMManipulation,
|
||||
TaskSourceName::FileReading,
|
||||
TaskSourceName::FontLoading,
|
||||
TaskSourceName::HistoryTraversal,
|
||||
TaskSourceName::Networking,
|
||||
TaskSourceName::PerformanceTimeline,
|
||||
TaskSourceName::PortMessage,
|
||||
TaskSourceName::UserInteraction,
|
||||
TaskSourceName::RemoteEvent,
|
||||
TaskSourceName::Rendering,
|
||||
TaskSourceName::MediaElement,
|
||||
TaskSourceName::WebSocket,
|
||||
TaskSourceName::Timer,
|
||||
TaskSourceName::Gamepad,
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) struct TaskSource<'task_manager> {
|
||||
pub(crate) task_manager: &'task_manager TaskManager,
|
||||
pub(crate) name: TaskSourceName,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue