chiark
/
gitweb
/
~ian
/
hippotat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename [Frame]QueueBuf
[hippotat.git]
/
src
/
queue.rs
diff --git
a/src/queue.rs
b/src/queue.rs
index ba1d4ffedf76bbf55056e6e2b3824ed972000258..c87e1d7b5a9c45cce1c877a41ea3d98efb88635b 100644
(file)
--- a/
src/queue.rs
+++ b/
src/queue.rs
@@
-5,18
+5,18
@@
use crate::prelude::*;
#[derive(Default,Clone)]
use crate::prelude::*;
#[derive(Default,Clone)]
-pub struct Queue<E> {
+pub struct Queue
Buf
<E> {
content: usize,
eaten1: usize, // 0 <= eaten1 < queue.front()...len()
queue: VecDeque<E>,
}
#[derive(Default,Debug,Clone)]
content: usize,
eaten1: usize, // 0 <= eaten1 < queue.front()...len()
queue: VecDeque<E>,
}
#[derive(Default,Debug,Clone)]
-pub struct FrameQueue {
- queue: Queue<Cervine<'static, Box<[u8]>, [u8]>>,
+pub struct FrameQueue
Buf
{
+ queue: Queue
Buf
<Cervine<'static, Box<[u8]>, [u8]>>,
}
}
-impl<E> Debug for Queue<E> where E: AsRef<[u8]> {
+impl<E> Debug for Queue
Buf
<E> where E: AsRef<[u8]> {
#[throws(fmt::Error)]
fn fmt(&self, f: &mut fmt::Formatter) {
write!(f, "Queue{{content={},eaten1={},queue=[",
#[throws(fmt::Error)]
fn fmt(&self, f: &mut fmt::Formatter) {
write!(f, "Queue{{content={},eaten1={},queue=[",
@@
-26,7
+26,7
@@
impl<E> Debug for Queue<E> where E: AsRef<[u8]> {
}
}
}
}
-impl<E> Queue<E> where E: AsRef<[u8]> {
+impl<E> Queue
Buf
<E> where E: AsRef<[u8]> {
pub fn push<B: Into<E>>(&mut self, b: B) {
self.push_(b.into());
}
pub fn push<B: Into<E>>(&mut self, b: B) {
self.push_(b.into());
}
@@
-38,7
+38,7
@@
impl<E> Queue<E> where E: AsRef<[u8]> {
pub fn is_empty(&self) -> bool { self.content == 0 }
}
pub fn is_empty(&self) -> bool { self.content == 0 }
}
-impl FrameQueue {
+impl FrameQueue
Buf
{
pub fn push<B: Into<Box<[u8]>>>(&mut self, b: B) {
self.push_(b.into());
}
pub fn push<B: Into<Box<[u8]>>>(&mut self, b: B) {
self.push_(b.into());
}
@@
-49,7
+49,7
@@
impl FrameQueue {
pub fn is_empty(&self) -> bool { self.queue.is_empty() }
}
pub fn is_empty(&self) -> bool { self.queue.is_empty() }
}
-impl<E> Extend<E> for FrameQueue where E: Into<Box<[u8]>> {
+impl<E> Extend<E> for FrameQueue
Buf
where E: Into<Box<[u8]>> {
fn extend<I>(&mut self, it: I)
where I: IntoIterator<Item=E>
{
fn extend<I>(&mut self, it: I)
where I: IntoIterator<Item=E>
{
@@
-57,7
+57,7
@@
impl<E> Extend<E> for FrameQueue where E: Into<Box<[u8]>> {
}
}
}
}
-impl<E> hyper::body::Buf for Queue<E> where E: AsRef<[u8]> {
+impl<E> hyper::body::Buf for Queue
Buf
<E> where E: AsRef<[u8]> {
fn remaining(&self) -> usize { self.content }
fn chunk(&self) -> &[u8] {
let front = if let Some(f) = self.queue.front() { f } else { return &[] };
fn remaining(&self) -> usize { self.content }
fn chunk(&self) -> &[u8] {
let front = if let Some(f) = self.queue.front() { f } else { return &[] };
@@
-76,7
+76,7
@@
impl<E> hyper::body::Buf for Queue<E> where E: AsRef<[u8]> {
}
}
}
}
-impl hyper::body::Buf for FrameQueue {
+impl hyper::body::Buf for FrameQueue
Buf
{
fn remaining(&self) -> usize { self.queue.remaining() }
fn chunk(&self) -> &[u8] { self.queue.chunk() }
fn advance(&mut self, cnt: usize) { self.queue.advance(cnt) }
fn remaining(&self) -> usize { self.queue.remaining() }
fn chunk(&self) -> &[u8] { self.queue.chunk() }
fn advance(&mut self, cnt: usize) { self.queue.advance(cnt) }