Skip to content

Commit ebe15c2

Browse files
author
Jorge Aparicio
committed
---
yaml --- r: 164653 b: refs/heads/auto c: 4c6e76b h: refs/heads/master i: 164651: a76fdc9 v: v3
1 parent 8ee503b commit ebe15c2

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
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: ce9243776932b69359226491187d5d9fc7c2d7b2
13+
refs/heads/auto: 4c6e76b7c8823b3fe259e7f8da21de2c86def554
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libtime/lib.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,12 @@ mod imp {
7676
}
7777

7878
/// A record specifying a time value in seconds and nanoseconds.
79-
#[deriving(Clone, PartialEq, Eq, PartialOrd, Ord, Encodable, Decodable, Show)]
79+
#[deriving(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Encodable, Decodable, Show)]
8080
pub struct Timespec {
8181
pub sec: i64,
8282
pub nsec: i32,
8383
}
8484

85-
impl Copy for Timespec {}
86-
8785
/*
8886
* Timespec assumes that pre-epoch Timespecs have negative sec and positive
8987
* nsec fields. Darwin's and Linux's struct timespec functions handle pre-
@@ -268,7 +266,7 @@ pub fn tzset() {
268266
/// also called a broken-down time value.
269267
// FIXME: use c_int instead of i32?
270268
#[repr(C)]
271-
#[deriving(Clone, PartialEq, Eq, Show)]
269+
#[deriving(Clone, Copy, PartialEq, Eq, Show)]
272270
pub struct Tm {
273271
/// Seconds after the minute - [0, 60]
274272
pub tm_sec: i32,
@@ -309,8 +307,6 @@ pub struct Tm {
309307
pub tm_nsec: i32,
310308
}
311309

312-
impl Copy for Tm {}
313-
314310
pub fn empty_tm() -> Tm {
315311
Tm {
316312
tm_sec: 0_i32,
@@ -452,7 +448,7 @@ impl Tm {
452448
}
453449
}
454450

455-
#[deriving(PartialEq)]
451+
#[deriving(Copy, PartialEq)]
456452
pub enum ParseError {
457453
InvalidSecond,
458454
InvalidMinute,
@@ -470,8 +466,6 @@ pub enum ParseError {
470466
UnexpectedCharacter(char, char),
471467
}
472468

473-
impl Copy for ParseError {}
474-
475469
impl Show for ParseError {
476470
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
477471
match *self {

0 commit comments

Comments
 (0)