Skip to content

Commit 784ce99

Browse files
author
Jorge Aparicio
committed
---
yaml --- r: 164638 b: refs/heads/auto c: fd4a5d9 h: refs/heads/master v: v3
1 parent 3e9760e commit 784ce99

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: a18d090c3cf6223b90c5a39e66ddef3e1932c7c7
13+
refs/heads/auto: fd4a5d9ef12a87cad61f2fa5dd0a011df263a2d0
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librbml/lib.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,13 @@ use std::str;
4141
pub mod io;
4242

4343
/// Common data structures
44-
#[deriving(Clone)]
44+
#[deriving(Clone, Copy)]
4545
pub struct Doc<'a> {
4646
pub data: &'a [u8],
4747
pub start: uint,
4848
pub end: uint,
4949
}
5050

51-
impl<'doc> Copy for Doc<'doc> {}
52-
5351
impl<'doc> Doc<'doc> {
5452
pub fn new(data: &'doc [u8]) -> Doc<'doc> {
5553
Doc { data: data, start: 0u, end: data.len() }
@@ -73,7 +71,7 @@ pub struct TaggedDoc<'a> {
7371
pub doc: Doc<'a>,
7472
}
7573

76-
#[deriving(Show)]
74+
#[deriving(Copy, Show)]
7775
pub enum EbmlEncoderTag {
7876
EsUint, // 0
7977
EsU64, // 1
@@ -107,8 +105,6 @@ pub enum EbmlEncoderTag {
107105
EsLabel, // Used only when debugging
108106
}
109107

110-
impl Copy for EbmlEncoderTag {}
111-
112108
#[deriving(Show)]
113109
pub enum Error {
114110
IntTooBig(uint),
@@ -151,13 +147,12 @@ pub mod reader {
151147
)
152148
}
153149

150+
#[deriving(Copy)]
154151
pub struct Res {
155152
pub val: uint,
156153
pub next: uint
157154
}
158155

159-
impl Copy for Res {}
160-
161156
#[inline(never)]
162157
fn vuint_at_slow(data: &[u8], start: uint) -> DecodeResult<Res> {
163158
let a = data[start];

0 commit comments

Comments
 (0)