diff --git a/Cargo.toml b/Cargo.toml index 48cd7f9c..691e6f0e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,7 @@ members = [ "notify", + "notify-types", "notify-debouncer-mini", "notify-debouncer-full", "file-id", diff --git a/notify-types/Cargo.toml b/notify-types/Cargo.toml new file mode 100644 index 00000000..57dfe5a0 --- /dev/null +++ b/notify-types/Cargo.toml @@ -0,0 +1,23 @@ +[package] +name = "notify-types" +version = "1.0.0" +rust-version = "1.63" +description = "Types used by the notify crate" +documentation = "https://docs.rs/notify-types" +homepage = "https://github.com/notify-rs/notify" +repository = "https://github.com/notify-rs/notify.git" +readme = "../README.md" +license = "MIT OR Apache-2.0" +keywords = ["events", "filesystem", "notify", "watch"] +categories = ["filesystem"] +authors = ["Daniel Faust "] + +edition = "2021" + +[dependencies] +serde = { version = "1.0.89", features = ["derive"], optional = true } + +[dev-dependencies] +serde_json = "1.0.39" +insta = "1.34.0" +rstest = "0.17.0" diff --git a/notify-types/LICENSE-APACHE b/notify-types/LICENSE-APACHE new file mode 100644 index 00000000..4c1c72e3 --- /dev/null +++ b/notify-types/LICENSE-APACHE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright 2023 Notify Contributors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/notify-types/LICENSE-MIT b/notify-types/LICENSE-MIT new file mode 100644 index 00000000..07c9dfc1 --- /dev/null +++ b/notify-types/LICENSE-MIT @@ -0,0 +1,25 @@ +Copyright (c) 2023 Notify Contributors + +Permission is hereby granted, free of charge, to any +person obtaining a copy of this software and associated +documentation files (the "Software"), to deal in the +Software without restriction, including without +limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software +is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice +shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT +SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/notify/src/event.rs b/notify-types/src/event.rs similarity index 99% rename from notify/src/event.rs rename to notify-types/src/event.rs index b870ec5f..f5bd4145 100644 --- a/notify/src/event.rs +++ b/notify-types/src/event.rs @@ -192,7 +192,7 @@ pub enum RemoveKind { /// This is arguably the most important classification for events. All subkinds below this one /// represent details that may or may not be available for any particular backend, but most tools /// and Notify systems will only care about which of these four general kinds an event is about. -#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)] +#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "serde", serde(rename_all = "kebab-case"))] #[cfg_attr(feature = "serde", serde(tag = "type"))] @@ -204,6 +204,7 @@ pub enum EventKind { /// gain bugs due to not matching new unknown event types. /// /// This variant is also the default variant used when Notify is in "imprecise" mode. + #[default] Any, /// An event describing non-mutating access operations on files. @@ -270,12 +271,6 @@ impl EventKind { } } -impl Default for EventKind { - fn default() -> Self { - EventKind::Any - } -} - /// Notify event. /// /// You might want to check [`Event::need_rescan`] to make sure no event was missed before you @@ -473,8 +468,7 @@ impl EventAttributes { } fn inner_mut(&mut self) -> &mut EventAttributesInner { - self.inner - .get_or_insert_with(|| Box::new(Default::default())) + self.inner.get_or_insert_with(Box::default) } } diff --git a/notify-types/src/lib.rs b/notify-types/src/lib.rs new file mode 100644 index 00000000..f2133292 --- /dev/null +++ b/notify-types/src/lib.rs @@ -0,0 +1,29 @@ +pub mod event; + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_debug_impl() { + macro_rules! assert_debug_impl { + ($t:ty) => {{ + trait NeedsDebug: std::fmt::Debug {} + impl NeedsDebug for $t {} + }}; + } + + assert_debug_impl!(event::AccessKind); + assert_debug_impl!(event::AccessMode); + assert_debug_impl!(event::CreateKind); + assert_debug_impl!(event::DataChange); + assert_debug_impl!(event::EventAttributes); + assert_debug_impl!(event::Flag); + assert_debug_impl!(event::MetadataKind); + assert_debug_impl!(event::ModifyKind); + assert_debug_impl!(event::RemoveKind); + assert_debug_impl!(event::RenameMode); + assert_debug_impl!(event::Event); + assert_debug_impl!(event::EventKind); + } +} diff --git a/notify/src/snapshots/notify__event__tests__access-any.snap b/notify-types/src/snapshots/notify_types__event__tests__access-any.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__access-any.snap rename to notify-types/src/snapshots/notify_types__event__tests__access-any.snap diff --git a/notify/src/snapshots/notify__event__tests__access-close-any.snap b/notify-types/src/snapshots/notify_types__event__tests__access-close-any.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__access-close-any.snap rename to notify-types/src/snapshots/notify_types__event__tests__access-close-any.snap diff --git a/notify/src/snapshots/notify__event__tests__access-close-execute.snap b/notify-types/src/snapshots/notify_types__event__tests__access-close-execute.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__access-close-execute.snap rename to notify-types/src/snapshots/notify_types__event__tests__access-close-execute.snap diff --git a/notify/src/snapshots/notify__event__tests__access-close-other.snap b/notify-types/src/snapshots/notify_types__event__tests__access-close-other.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__access-close-other.snap rename to notify-types/src/snapshots/notify_types__event__tests__access-close-other.snap diff --git a/notify/src/snapshots/notify__event__tests__access-close-read.snap b/notify-types/src/snapshots/notify_types__event__tests__access-close-read.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__access-close-read.snap rename to notify-types/src/snapshots/notify_types__event__tests__access-close-read.snap diff --git a/notify/src/snapshots/notify__event__tests__access-close-write.snap b/notify-types/src/snapshots/notify_types__event__tests__access-close-write.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__access-close-write.snap rename to notify-types/src/snapshots/notify_types__event__tests__access-close-write.snap diff --git a/notify/src/snapshots/notify__event__tests__access-open-any.snap b/notify-types/src/snapshots/notify_types__event__tests__access-open-any.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__access-open-any.snap rename to notify-types/src/snapshots/notify_types__event__tests__access-open-any.snap diff --git a/notify/src/snapshots/notify__event__tests__access-open-execute.snap b/notify-types/src/snapshots/notify_types__event__tests__access-open-execute.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__access-open-execute.snap rename to notify-types/src/snapshots/notify_types__event__tests__access-open-execute.snap diff --git a/notify/src/snapshots/notify__event__tests__access-open-other.snap b/notify-types/src/snapshots/notify_types__event__tests__access-open-other.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__access-open-other.snap rename to notify-types/src/snapshots/notify_types__event__tests__access-open-other.snap diff --git a/notify/src/snapshots/notify__event__tests__access-open-read.snap b/notify-types/src/snapshots/notify_types__event__tests__access-open-read.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__access-open-read.snap rename to notify-types/src/snapshots/notify_types__event__tests__access-open-read.snap diff --git a/notify/src/snapshots/notify__event__tests__access-open-write.snap b/notify-types/src/snapshots/notify_types__event__tests__access-open-write.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__access-open-write.snap rename to notify-types/src/snapshots/notify_types__event__tests__access-open-write.snap diff --git a/notify/src/snapshots/notify__event__tests__access-other.snap b/notify-types/src/snapshots/notify_types__event__tests__access-other.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__access-other.snap rename to notify-types/src/snapshots/notify_types__event__tests__access-other.snap diff --git a/notify/src/snapshots/notify__event__tests__access-read.snap b/notify-types/src/snapshots/notify_types__event__tests__access-read.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__access-read.snap rename to notify-types/src/snapshots/notify_types__event__tests__access-read.snap diff --git a/notify/src/snapshots/notify__event__tests__any.snap b/notify-types/src/snapshots/notify_types__event__tests__any.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__any.snap rename to notify-types/src/snapshots/notify_types__event__tests__any.snap diff --git a/notify/src/snapshots/notify__event__tests__create-any.snap b/notify-types/src/snapshots/notify_types__event__tests__create-any.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__create-any.snap rename to notify-types/src/snapshots/notify_types__event__tests__create-any.snap diff --git a/notify/src/snapshots/notify__event__tests__create-file.snap b/notify-types/src/snapshots/notify_types__event__tests__create-file.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__create-file.snap rename to notify-types/src/snapshots/notify_types__event__tests__create-file.snap diff --git a/notify/src/snapshots/notify__event__tests__create-folder.snap b/notify-types/src/snapshots/notify_types__event__tests__create-folder.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__create-folder.snap rename to notify-types/src/snapshots/notify_types__event__tests__create-folder.snap diff --git a/notify/src/snapshots/notify__event__tests__create-other.snap b/notify-types/src/snapshots/notify_types__event__tests__create-other.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__create-other.snap rename to notify-types/src/snapshots/notify_types__event__tests__create-other.snap diff --git a/notify/src/snapshots/notify__event__tests__modify-any.snap b/notify-types/src/snapshots/notify_types__event__tests__modify-any.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__modify-any.snap rename to notify-types/src/snapshots/notify_types__event__tests__modify-any.snap diff --git a/notify/src/snapshots/notify__event__tests__modify-data-any.snap b/notify-types/src/snapshots/notify_types__event__tests__modify-data-any.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__modify-data-any.snap rename to notify-types/src/snapshots/notify_types__event__tests__modify-data-any.snap diff --git a/notify/src/snapshots/notify__event__tests__modify-data-content.snap b/notify-types/src/snapshots/notify_types__event__tests__modify-data-content.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__modify-data-content.snap rename to notify-types/src/snapshots/notify_types__event__tests__modify-data-content.snap diff --git a/notify/src/snapshots/notify__event__tests__modify-data-other.snap b/notify-types/src/snapshots/notify_types__event__tests__modify-data-other.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__modify-data-other.snap rename to notify-types/src/snapshots/notify_types__event__tests__modify-data-other.snap diff --git a/notify/src/snapshots/notify__event__tests__modify-data-size.snap b/notify-types/src/snapshots/notify_types__event__tests__modify-data-size.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__modify-data-size.snap rename to notify-types/src/snapshots/notify_types__event__tests__modify-data-size.snap diff --git a/notify/src/snapshots/notify__event__tests__modify-metadata-accesstime.snap b/notify-types/src/snapshots/notify_types__event__tests__modify-metadata-accesstime.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__modify-metadata-accesstime.snap rename to notify-types/src/snapshots/notify_types__event__tests__modify-metadata-accesstime.snap diff --git a/notify/src/snapshots/notify__event__tests__modify-metadata-any.snap b/notify-types/src/snapshots/notify_types__event__tests__modify-metadata-any.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__modify-metadata-any.snap rename to notify-types/src/snapshots/notify_types__event__tests__modify-metadata-any.snap diff --git a/notify/src/snapshots/notify__event__tests__modify-metadata-extended.snap b/notify-types/src/snapshots/notify_types__event__tests__modify-metadata-extended.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__modify-metadata-extended.snap rename to notify-types/src/snapshots/notify_types__event__tests__modify-metadata-extended.snap diff --git a/notify/src/snapshots/notify__event__tests__modify-metadata-other.snap b/notify-types/src/snapshots/notify_types__event__tests__modify-metadata-other.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__modify-metadata-other.snap rename to notify-types/src/snapshots/notify_types__event__tests__modify-metadata-other.snap diff --git a/notify/src/snapshots/notify__event__tests__modify-metadata-ownership.snap b/notify-types/src/snapshots/notify_types__event__tests__modify-metadata-ownership.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__modify-metadata-ownership.snap rename to notify-types/src/snapshots/notify_types__event__tests__modify-metadata-ownership.snap diff --git a/notify/src/snapshots/notify__event__tests__modify-metadata-permissions.snap b/notify-types/src/snapshots/notify_types__event__tests__modify-metadata-permissions.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__modify-metadata-permissions.snap rename to notify-types/src/snapshots/notify_types__event__tests__modify-metadata-permissions.snap diff --git a/notify/src/snapshots/notify__event__tests__modify-metadata-writetime.snap b/notify-types/src/snapshots/notify_types__event__tests__modify-metadata-writetime.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__modify-metadata-writetime.snap rename to notify-types/src/snapshots/notify_types__event__tests__modify-metadata-writetime.snap diff --git a/notify/src/snapshots/notify__event__tests__modify-name-any.snap b/notify-types/src/snapshots/notify_types__event__tests__modify-name-any.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__modify-name-any.snap rename to notify-types/src/snapshots/notify_types__event__tests__modify-name-any.snap diff --git a/notify/src/snapshots/notify__event__tests__modify-name-both.snap b/notify-types/src/snapshots/notify_types__event__tests__modify-name-both.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__modify-name-both.snap rename to notify-types/src/snapshots/notify_types__event__tests__modify-name-both.snap diff --git a/notify/src/snapshots/notify__event__tests__modify-name-from.snap b/notify-types/src/snapshots/notify_types__event__tests__modify-name-from.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__modify-name-from.snap rename to notify-types/src/snapshots/notify_types__event__tests__modify-name-from.snap diff --git a/notify/src/snapshots/notify__event__tests__modify-name-other.snap b/notify-types/src/snapshots/notify_types__event__tests__modify-name-other.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__modify-name-other.snap rename to notify-types/src/snapshots/notify_types__event__tests__modify-name-other.snap diff --git a/notify/src/snapshots/notify__event__tests__modify-name-to.snap b/notify-types/src/snapshots/notify_types__event__tests__modify-name-to.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__modify-name-to.snap rename to notify-types/src/snapshots/notify_types__event__tests__modify-name-to.snap diff --git a/notify/src/snapshots/notify__event__tests__modify-other.snap b/notify-types/src/snapshots/notify_types__event__tests__modify-other.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__modify-other.snap rename to notify-types/src/snapshots/notify_types__event__tests__modify-other.snap diff --git a/notify/src/snapshots/notify__event__tests__other.snap b/notify-types/src/snapshots/notify_types__event__tests__other.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__other.snap rename to notify-types/src/snapshots/notify_types__event__tests__other.snap diff --git a/notify/src/snapshots/notify__event__tests__remove-any.snap b/notify-types/src/snapshots/notify_types__event__tests__remove-any.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__remove-any.snap rename to notify-types/src/snapshots/notify_types__event__tests__remove-any.snap diff --git a/notify/src/snapshots/notify__event__tests__remove-file.snap b/notify-types/src/snapshots/notify_types__event__tests__remove-file.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__remove-file.snap rename to notify-types/src/snapshots/notify_types__event__tests__remove-file.snap diff --git a/notify/src/snapshots/notify__event__tests__remove-folder.snap b/notify-types/src/snapshots/notify_types__event__tests__remove-folder.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__remove-folder.snap rename to notify-types/src/snapshots/notify_types__event__tests__remove-folder.snap diff --git a/notify/src/snapshots/notify__event__tests__remove-other.snap b/notify-types/src/snapshots/notify_types__event__tests__remove-other.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__remove-other.snap rename to notify-types/src/snapshots/notify_types__event__tests__remove-other.snap diff --git a/notify/src/snapshots/notify__event__tests__serialize_event_with_attrs.snap b/notify-types/src/snapshots/notify_types__event__tests__serialize_event_with_attrs.snap similarity index 100% rename from notify/src/snapshots/notify__event__tests__serialize_event_with_attrs.snap rename to notify-types/src/snapshots/notify_types__event__tests__serialize_event_with_attrs.snap diff --git a/notify/Cargo.toml b/notify/Cargo.toml index 0015918b..115f3524 100644 --- a/notify/Cargo.toml +++ b/notify/Cargo.toml @@ -19,11 +19,11 @@ authors = [ edition = "2021" [dependencies] +notify-types = { verison = "1.0.0", path = "../notify-types" } crossbeam-channel = { version = "0.5.0", optional = true } filetime = "0.2.22" libc = "0.2.4" log = "0.4.17" -serde = { version = "1.0.89", features = ["derive"], optional = true } walkdir = "2.2.2" [target.'cfg(any(target_os="linux", target_os="android"))'.dependencies] @@ -52,6 +52,7 @@ rstest = "0.17.0" [features] default = ["macos_fsevent","crossbeam-channel"] +serde = ["notify-types/serde"] timing_tests = [] manual_tests = [] macos_kqueue = ["kqueue", "mio"] diff --git a/notify/src/lib.rs b/notify/src/lib.rs index b848e913..40d7fa03 100644 --- a/notify/src/lib.rs +++ b/notify/src/lib.rs @@ -178,7 +178,7 @@ pub use config::{Config, RecursiveMode}; pub use error::{Error, ErrorKind, Result}; -pub use event::{Event, EventKind}; +pub use notify_types::event::{self, Event, EventKind}; use std::path::Path; #[allow(dead_code)] @@ -255,7 +255,6 @@ pub mod kqueue; #[cfg(target_os = "windows")] pub mod windows; -pub mod event; pub mod null; pub mod poll; @@ -445,18 +444,6 @@ mod tests { assert_debug_impl!(Config); assert_debug_impl!(Error); assert_debug_impl!(ErrorKind); - assert_debug_impl!(event::AccessKind); - assert_debug_impl!(event::AccessMode); - assert_debug_impl!(event::CreateKind); - assert_debug_impl!(event::DataChange); - assert_debug_impl!(event::EventAttributes); - assert_debug_impl!(event::Flag); - assert_debug_impl!(event::MetadataKind); - assert_debug_impl!(event::ModifyKind); - assert_debug_impl!(event::RemoveKind); - assert_debug_impl!(event::RenameMode); - assert_debug_impl!(Event); - assert_debug_impl!(EventKind); assert_debug_impl!(NullWatcher); assert_debug_impl!(PollWatcher); assert_debug_impl!(RecommendedWatcher);