remove the file engine feature in the html crate (#3392)
This commit is contained in:
1 parent
c2952a79f8
commit
aab1258f0e
9 files changed
+65
-66
No files matched your search
@@ -59,7 +59,6 @@ impl DragData {
|
||||
}
|
||||
|
||||
impl crate::HasFileData for DragData {
|
||||
#[cfg(feature = "file_engine")]
|
||||
fn files(&self) -> Option<std::sync::Arc<dyn crate::file_data::FileEngine>> {
|
||||
self.inner.files()
|
||||
}
|
||||
@@ -112,7 +111,6 @@ impl PointerInteraction for DragData {
|
||||
pub struct SerializedDragData {
|
||||
pub mouse: crate::point_interaction::SerializedPointInteraction,
|
||||
|
||||
#[cfg(feature = "file_engine")]
|
||||
#[serde(default)]
|
||||
files: Option<crate::file_data::SerializedFileEngine>,
|
||||
}
|
||||
@@ -122,7 +120,6 @@ impl SerializedDragData {
|
||||
fn new(drag: &DragData) -> Self {
|
||||
Self {
|
||||
mouse: crate::point_interaction::SerializedPointInteraction::from(drag),
|
||||
#[cfg(feature = "file_engine")]
|
||||
files: None,
|
||||
}
|
||||
}
|
||||
@@ -137,7 +134,6 @@ impl HasDragData for SerializedDragData {
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
impl crate::file_data::HasFileData for SerializedDragData {
|
||||
#[cfg(feature = "file_engine")]
|
||||
fn files(&self) -> Option<std::sync::Arc<dyn crate::file_data::FileEngine>> {
|
||||
self.files
|
||||
.as_ref()
|
||||
|
||||
@@ -105,7 +105,6 @@ impl FormData {
|
||||
}
|
||||
|
||||
/// Get the files of the form event
|
||||
#[cfg(feature = "file_engine")]
|
||||
pub fn files(&self) -> Option<std::sync::Arc<dyn crate::file_data::FileEngine>> {
|
||||
self.inner.files()
|
||||
}
|
||||
@@ -177,7 +176,6 @@ pub struct SerializedFormData {
|
||||
#[serde(default)]
|
||||
valid: bool,
|
||||
|
||||
#[cfg(feature = "file_engine")]
|
||||
#[serde(default)]
|
||||
files: Option<crate::file_data::SerializedFileEngine>,
|
||||
}
|
||||
@@ -190,12 +188,10 @@ impl SerializedFormData {
|
||||
value,
|
||||
values,
|
||||
valid: true,
|
||||
#[cfg(feature = "file_engine")]
|
||||
files: None,
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "file_engine")]
|
||||
/// Add files to the serialized form data object
|
||||
pub fn with_files(mut self, files: crate::file_data::SerializedFileEngine) -> Self {
|
||||
self.files = Some(files);
|
||||
@@ -208,7 +204,6 @@ impl SerializedFormData {
|
||||
value: data.value(),
|
||||
values: data.values(),
|
||||
valid: data.valid(),
|
||||
#[cfg(feature = "file_engine")]
|
||||
files: {
|
||||
match data.files() {
|
||||
Some(files) => {
|
||||
@@ -234,7 +229,6 @@ impl SerializedFormData {
|
||||
value: data.value(),
|
||||
values: data.values(),
|
||||
valid: data.valid(),
|
||||
#[cfg(feature = "file_engine")]
|
||||
files: None,
|
||||
}
|
||||
}
|
||||
@@ -261,7 +255,6 @@ impl HasFormData for SerializedFormData {
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
impl HasFileData for SerializedFormData {
|
||||
#[cfg(feature = "file_engine")]
|
||||
fn files(&self) -> Option<std::sync::Arc<dyn crate::FileEngine>> {
|
||||
self.files
|
||||
.as_ref()
|
||||
@@ -269,7 +262,6 @@ impl HasFileData for SerializedFormData {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "file_engine")]
|
||||
impl HasFileData for FormData {
|
||||
fn files(&self) -> Option<std::sync::Arc<dyn crate::FileEngine>> {
|
||||
self.inner.files()
|
||||
|
||||
@@ -1,15 +1,10 @@
|
||||
pub trait HasFileData: std::any::Any {
|
||||
// NOTE: The methods of this trait are config'ed out instead of the trait
|
||||
// itself because several other traits inherit from this trait and there isn't a clean way to
|
||||
// conditionally inherit from a trait based on a config.
|
||||
#[cfg(feature = "file_engine")]
|
||||
fn files(&self) -> Option<std::sync::Arc<dyn FileEngine>> {
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
#[cfg(feature = "file_engine")]
|
||||
/// A file engine that serializes files to bytes
|
||||
#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
|
||||
pub struct SerializedFileEngine {
|
||||
@@ -17,7 +12,6 @@ pub struct SerializedFileEngine {
|
||||
}
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
#[cfg(feature = "file_engine")]
|
||||
#[async_trait::async_trait(?Send)]
|
||||
impl FileEngine for SerializedFileEngine {
|
||||
fn files(&self) -> Vec<String> {
|
||||
@@ -46,7 +40,6 @@ impl FileEngine for SerializedFileEngine {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "file_engine")]
|
||||
#[async_trait::async_trait(?Send)]
|
||||
pub trait FileEngine {
|
||||
// get a list of file names
|
||||
|
||||
Reference in new issue
Block a user