aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-01-29 00:12:24 +0100
committermetamuffin <metamuffin@disroot.org>2024-01-29 00:12:24 +0100
commitaf9280c998f6c2c7c40b2067ffa02d89784b40fa (patch)
treeb78ffae8e5d9b8fe51347d1943162814dfb6de2e
parent95c4c4ae8d089af1f3d07887cbf437555c2d6159 (diff)
downloadjellything-af9280c998f6c2c7c40b2067ffa02d89784b40fa.tar
jellything-af9280c998f6c2c7c40b2067ffa02d89784b40fa.tar.bz2
jellything-af9280c998f6c2c7c40b2067ffa02d89784b40fa.tar.zst
merge imports
-rw-r--r--matroska/src/block.rs8
-rw-r--r--matroska/src/read.rs4
-rw-r--r--matroska/src/unflatten.rs3
-rw-r--r--matroska/src/write.rs4
4 files changed, 8 insertions, 11 deletions
diff --git a/matroska/src/block.rs b/matroska/src/block.rs
index 1ab8ceb..6cf9891 100644
--- a/matroska/src/block.rs
+++ b/matroska/src/block.rs
@@ -3,9 +3,11 @@
which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
Copyright (C) 2024 metamuffin <metamuffin.org>
*/
-use crate::write::vint_length;
-use crate::{read::ReadExt, write::write_vint};
-use crate::{ReadValue, Result, WriteValue};
+use crate::{
+ read::ReadExt,
+ write::{vint_length, write_vint},
+ ReadValue, Result, WriteValue,
+};
use std::io::{Cursor, Write};
#[derive(Debug, PartialEq, Clone, Copy)]
diff --git a/matroska/src/read.rs b/matroska/src/read.rs
index 68a8efa..536f2f8 100644
--- a/matroska/src/read.rs
+++ b/matroska/src/read.rs
@@ -3,9 +3,7 @@
which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
Copyright (C) 2024 metamuffin <metamuffin.org>
*/
-use crate::error::Error;
-use crate::Result;
-use crate::{matroska::MatroskaTag, size::EbmlSize, Master};
+use crate::{error::Error, matroska::MatroskaTag, size::EbmlSize, Master, Result};
use log::{debug, warn};
use std::{
collections::VecDeque,
diff --git a/matroska/src/unflatten.rs b/matroska/src/unflatten.rs
index 944d2c7..b559598 100644
--- a/matroska/src/unflatten.rs
+++ b/matroska/src/unflatten.rs
@@ -3,8 +3,7 @@
which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
Copyright (C) 2024 metamuffin <metamuffin.org>
*/
-use crate::Result;
-use crate::{matroska::MatroskaTag, Master};
+use crate::{matroska::MatroskaTag, Master, Result};
pub struct Unflat<'a> {
pub item: MatroskaTag,
diff --git a/matroska/src/write.rs b/matroska/src/write.rs
index 7eb13f1..1ec8564 100644
--- a/matroska/src/write.rs
+++ b/matroska/src/write.rs
@@ -3,9 +3,7 @@
which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
Copyright (C) 2024 metamuffin <metamuffin.org>
*/
-use crate::error::Error;
-use crate::Result;
-use crate::{matroska::MatroskaTag, size::EbmlSize, Master};
+use crate::{error::Error, matroska::MatroskaTag, size::EbmlSize, Master, Result};
use log::debug;
use std::io::{Seek, Write};