Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clippy: Fix the error of variants having the same prefix. (#31953)

Browse source 
* fix error: all variants have same prefix

* made the suggested changes

* fixed errors caused by commit

* silenced the clippy warning.

* ran ./mach fmt

* Update components/script/dom/htmlmediaelement.rs

Co-authored-by: Samson <16504129+sagudev@users.noreply.github.com>

---------

Co-authored-by: Samson <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
Aarya Khandelwal 2024-04-05 22:01:41 +05:30 • committed by GitHub
parent 9ee45425e9
commit 275fad8b78
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 41 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/script/dom/dedicatedworkerglobalscope.rs
View file

@ -104,9 +104,9 @@ pub enum DedicatedWorkerScriptMsg {
} }
pub enum MixedMessage { pub enum MixedMessage {
FromWorker(DedicatedWorkerScriptMsg), Worker(DedicatedWorkerScriptMsg),
FromDevtools(DevtoolScriptControlMsg), Devtools(DevtoolScriptControlMsg),
FromControl(DedicatedWorkerControlMsg), Control(DedicatedWorkerControlMsg),
} }
impl QueuedTaskConversion for DedicatedWorkerScriptMsg { impl QueuedTaskConversion for DedicatedWorkerScriptMsg {
@ -220,15 +220,15 @@ impl WorkerEventLoopMethods for DedicatedWorkerGlobalScope {
} }
fn from_control_msg(&self, msg: DedicatedWorkerControlMsg) -> MixedMessage { fn from_control_msg(&self, msg: DedicatedWorkerControlMsg) -> MixedMessage {
MixedMessage::FromControl(msg) MixedMessage::Control(msg)
} }
fn from_worker_msg(&self, msg: DedicatedWorkerScriptMsg) -> MixedMessage { fn from_worker_msg(&self, msg: DedicatedWorkerScriptMsg) -> MixedMessage {
MixedMessage::FromWorker(msg) MixedMessage::Worker(msg)
} }
fn from_devtools_msg(&self, msg: DevtoolScriptControlMsg) -> MixedMessage { fn from_devtools_msg(&self, msg: DevtoolScriptControlMsg) -> MixedMessage {
MixedMessage::FromDevtools(msg) MixedMessage::Devtools(msg)
} }
fn control_receiver(&self) -> &Receiver<DedicatedWorkerControlMsg> { fn control_receiver(&self) -> &Receiver<DedicatedWorkerControlMsg> {
@ -539,7 +539,7 @@ impl DedicatedWorkerGlobalScope {
fn handle_mixed_message(&self, msg: MixedMessage) -> bool { fn handle_mixed_message(&self, msg: MixedMessage) -> bool {
// FIXME(#26324): `self.worker` is None in devtools messages. // FIXME(#26324): `self.worker` is None in devtools messages.
match msg { match msg {
MixedMessage::FromDevtools(msg) => match msg { MixedMessage::Devtools(msg) => match msg {
DevtoolScriptControlMsg::EvaluateJS(_pipe_id, string, sender) => { DevtoolScriptControlMsg::EvaluateJS(_pipe_id, string, sender) => {
devtools::handle_evaluate_js(self.upcast(), string, sender) devtools::handle_evaluate_js(self.upcast(), string, sender)
}, },
@ -548,15 +548,12 @@ impl DedicatedWorkerGlobalScope {
}, },
_ => debug!("got an unusable devtools control message inside the worker!"), _ => debug!("got an unusable devtools control message inside the worker!"),
}, },
MixedMessage::FromWorker(DedicatedWorkerScriptMsg::CommonWorker( MixedMessage::Worker(DedicatedWorkerScriptMsg::CommonWorker(linked_worker, msg)) => {
linked_worker,
msg,
)) => {
let _ar = AutoWorkerReset::new(self, linked_worker); let _ar = AutoWorkerReset::new(self, linked_worker);
self.handle_script_event(msg); self.handle_script_event(msg);
}, },
MixedMessage::FromWorker(DedicatedWorkerScriptMsg::WakeUp) => {}, MixedMessage::Worker(DedicatedWorkerScriptMsg::WakeUp) => {},
MixedMessage::FromControl(DedicatedWorkerControlMsg::Exit) => { MixedMessage::Control(DedicatedWorkerControlMsg::Exit) => {
return false; return false;
}, },
} }

18
components/script/dom/filereader.rs
View file

@ -41,9 +41,9 @@ use crate::task_source::{TaskSource, TaskSourceName};
#[derive(Clone, Copy, JSTraceable, MallocSizeOf, PartialEq)] #[derive(Clone, Copy, JSTraceable, MallocSizeOf, PartialEq)]
pub enum FileReaderFunction { pub enum FileReaderFunction {
ReadAsText, Text,
ReadAsDataUrl, DataUrl,
ReadAsArrayBuffer, ArrayBuffer,
} }
pub type TrustedFileReader = Trusted<FileReader>; pub type TrustedFileReader = Trusted<FileReader>;
@ -253,13 +253,13 @@ impl FileReader {
// Step 8.2 // Step 8.2
match data.function { match data.function {
FileReaderFunction::ReadAsDataUrl => { FileReaderFunction::DataUrl => {
FileReader::perform_readasdataurl(&fr.result, data, &blob_contents) FileReader::perform_readasdataurl(&fr.result, data, &blob_contents)
}, },
FileReaderFunction::ReadAsText => { FileReaderFunction::Text => {
FileReader::perform_readastext(&fr.result, data, &blob_contents) FileReader::perform_readastext(&fr.result, data, &blob_contents)
}, },
FileReaderFunction::ReadAsArrayBuffer => { FileReaderFunction::ArrayBuffer => {
let _ac = enter_realm(&*fr); let _ac = enter_realm(&*fr);
FileReader::perform_readasarraybuffer( FileReader::perform_readasarraybuffer(
&fr.result, &fr.result,
@ -349,17 +349,17 @@ impl FileReaderMethods for FileReader {
// https://w3c.github.io/FileAPI/#dfn-readAsArrayBuffer // https://w3c.github.io/FileAPI/#dfn-readAsArrayBuffer
fn ReadAsArrayBuffer(&self, blob: &Blob) -> ErrorResult { fn ReadAsArrayBuffer(&self, blob: &Blob) -> ErrorResult {
self.read(FileReaderFunction::ReadAsArrayBuffer, blob, None) self.read(FileReaderFunction::ArrayBuffer, blob, None)
} }
// https://w3c.github.io/FileAPI/#dfn-readAsDataURL // https://w3c.github.io/FileAPI/#dfn-readAsDataURL
fn ReadAsDataURL(&self, blob: &Blob) -> ErrorResult { fn ReadAsDataURL(&self, blob: &Blob) -> ErrorResult {
self.read(FileReaderFunction::ReadAsDataUrl, blob, None) self.read(FileReaderFunction::DataUrl, blob, None)
} }
// https://w3c.github.io/FileAPI/#dfn-readAsText // https://w3c.github.io/FileAPI/#dfn-readAsText
fn ReadAsText(&self, blob: &Blob, label: Option<DOMString>) -> ErrorResult { fn ReadAsText(&self, blob: &Blob, label: Option<DOMString>) -> ErrorResult {
self.read(FileReaderFunction::ReadAsText, blob, label) self.read(FileReaderFunction::Text, blob, label)
} }
// https://w3c.github.io/FileAPI/#dfn-abort // https://w3c.github.io/FileAPI/#dfn-abort

26
components/script/dom/htmlformelement.rs
View file

@ -826,21 +826,19 @@ impl HTMLFormElement {
// Step 22 // Step 22
match (&*scheme, method) { match (&*scheme, method) {
(_, FormMethod::FormDialog) => { (_, FormMethod::Dialog) => {
// TODO: Submit dialog // TODO: Submit dialog
// https://html.spec.whatwg.org/multipage/#submit-dialog // https://html.spec.whatwg.org/multipage/#submit-dialog
}, },
// https://html.spec.whatwg.org/multipage/#submit-mutate-action // https://html.spec.whatwg.org/multipage/#submit-mutate-action
("http", FormMethod::FormGet) | ("http", FormMethod::Get) | ("https", FormMethod::Get) | ("data", FormMethod::Get) => {
("https", FormMethod::FormGet) |
("data", FormMethod::FormGet) => {
load_data load_data
.headers .headers
.typed_insert(ContentType::from(mime::APPLICATION_WWW_FORM_URLENCODED)); .typed_insert(ContentType::from(mime::APPLICATION_WWW_FORM_URLENCODED));
self.mutate_action_url(&mut form_data, load_data, encoding, target_window); self.mutate_action_url(&mut form_data, load_data, encoding, target_window);
}, },
// https://html.spec.whatwg.org/multipage/#submit-body // https://html.spec.whatwg.org/multipage/#submit-body
("http", FormMethod::FormPost) | ("https", FormMethod::FormPost) => { ("http", FormMethod::Post) | ("https", FormMethod::Post) => {
load_data.method = Method::POST; load_data.method = Method::POST;
self.submit_entity_body( self.submit_entity_body(
&mut form_data, &mut form_data,
@ -853,16 +851,16 @@ impl HTMLFormElement {
// https://html.spec.whatwg.org/multipage/#submit-get-action // https://html.spec.whatwg.org/multipage/#submit-get-action
("file", _) | ("file", _) |
("about", _) | ("about", _) |
("data", FormMethod::FormPost) | ("data", FormMethod::Post) |
("ftp", _) | ("ftp", _) |
("javascript", _) => { ("javascript", _) => {
self.plan_to_navigate(load_data, target_window); self.plan_to_navigate(load_data, target_window);
}, },
("mailto", FormMethod::FormPost) => { ("mailto", FormMethod::Post) => {
// TODO: Mail as body // TODO: Mail as body
// https://html.spec.whatwg.org/multipage/#submit-mailto-body // https://html.spec.whatwg.org/multipage/#submit-mailto-body
}, },
("mailto", FormMethod::FormGet) => { ("mailto", FormMethod::Get) => {
// TODO: Mail with headers // TODO: Mail with headers
// https://html.spec.whatwg.org/multipage/#submit-mailto-headers // https://html.spec.whatwg.org/multipage/#submit-mailto-headers
}, },
@ -1361,9 +1359,9 @@ pub enum FormEncType {
#[derive(Clone, Copy, MallocSizeOf)] #[derive(Clone, Copy, MallocSizeOf)]
pub enum FormMethod { pub enum FormMethod {
FormGet, Get,
FormPost, Post,
FormDialog, Dialog,
} }
/// <https://html.spec.whatwg.org/multipage/#form-associated-element> /// <https://html.spec.whatwg.org/multipage/#form-associated-element>
@ -1431,9 +1429,9 @@ impl<'a> FormSubmitter<'a> {
), ),
}; };
match &*attr { match &*attr {
"dialog" => FormMethod::FormDialog, "dialog" => FormMethod::Dialog,
"post" => FormMethod::FormPost, "post" => FormMethod::Post,
_ => FormMethod::FormGet, _ => FormMethod::Get,
} }
} }

1
components/script/dom/htmlmediaelement.rs
View file

@ -412,6 +412,7 @@ pub enum NetworkState {
/// <https://html.spec.whatwg.org/multipage/#dom-media-readystate> /// <https://html.spec.whatwg.org/multipage/#dom-media-readystate>
#[derive(Clone, Copy, Debug, JSTraceable, MallocSizeOf, PartialEq, PartialOrd)] #[derive(Clone, Copy, Debug, JSTraceable, MallocSizeOf, PartialEq, PartialOrd)]
#[repr(u8)] #[repr(u8)]
#[allow(clippy::enum_variant_names)] // Clippy warning silenced here because these names are from the specification.
pub enum ReadyState { pub enum ReadyState {
HaveNothing = HTMLMediaElementConstants::HAVE_NOTHING as u8, HaveNothing = HTMLMediaElementConstants::HAVE_NOTHING as u8,
HaveMetadata = HTMLMediaElementConstants::HAVE_METADATA as u8, HaveMetadata = HTMLMediaElementConstants::HAVE_METADATA as u8,

18
components/script/dom/serviceworkerglobalscope.rs
View file

@ -123,9 +123,9 @@ pub enum ServiceWorkerControlMsg {
} }
pub enum MixedMessage { pub enum MixedMessage {
FromServiceWorker(ServiceWorkerScriptMsg), ServiceWorker(ServiceWorkerScriptMsg),
FromDevtools(DevtoolScriptControlMsg), Devtools(DevtoolScriptControlMsg),
FromControl(ServiceWorkerControlMsg), Control(ServiceWorkerControlMsg),
} }
#[derive(Clone, JSTraceable)] #[derive(Clone, JSTraceable)]
@ -202,15 +202,15 @@ impl WorkerEventLoopMethods for ServiceWorkerGlobalScope {
} }
fn from_control_msg(&self, msg: ServiceWorkerControlMsg) -> MixedMessage { fn from_control_msg(&self, msg: ServiceWorkerControlMsg) -> MixedMessage {
MixedMessage::FromControl(msg) MixedMessage::Control(msg)
} }
fn from_worker_msg(&self, msg: ServiceWorkerScriptMsg) -> MixedMessage { fn from_worker_msg(&self, msg: ServiceWorkerScriptMsg) -> MixedMessage {
MixedMessage::FromServiceWorker(msg) MixedMessage::ServiceWorker(msg)
} }
fn from_devtools_msg(&self, msg: DevtoolScriptControlMsg) -> MixedMessage { fn from_devtools_msg(&self, msg: DevtoolScriptControlMsg) -> MixedMessage {
MixedMessage::FromDevtools(msg) MixedMessage::Devtools(msg)
} }
fn control_receiver(&self) -> &Receiver<ServiceWorkerControlMsg> { fn control_receiver(&self) -> &Receiver<ServiceWorkerControlMsg> {
@ -414,7 +414,7 @@ impl ServiceWorkerGlobalScope {
fn handle_mixed_message(&self, msg: MixedMessage) -> bool { fn handle_mixed_message(&self, msg: MixedMessage) -> bool {
match msg { match msg {
MixedMessage::FromDevtools(msg) => match msg { MixedMessage::Devtools(msg) => match msg {
DevtoolScriptControlMsg::EvaluateJS(_pipe_id, string, sender) => { DevtoolScriptControlMsg::EvaluateJS(_pipe_id, string, sender) => {
devtools::handle_evaluate_js(self.upcast(), string, sender) devtools::handle_evaluate_js(self.upcast(), string, sender)
}, },
@ -423,10 +423,10 @@ impl ServiceWorkerGlobalScope {
}, },
_ => debug!("got an unusable devtools control message inside the worker!"), _ => debug!("got an unusable devtools control message inside the worker!"),
}, },
MixedMessage::FromServiceWorker(msg) => { MixedMessage::ServiceWorker(msg) => {
self.handle_script_event(msg); self.handle_script_event(msg);
}, },
MixedMessage::FromControl(ServiceWorkerControlMsg::Exit) => { MixedMessage::Control(ServiceWorkerControlMsg::Exit) => {
return false; return false;
}, },
} }