Skip to content

Commit bcc3600

Browse files
committed
---
yaml --- r: 50544 b: refs/heads/try c: 1cde7e6 h: refs/heads/master v: v3
1 parent 3157d66 commit bcc3600

File tree

4 files changed

+49
-5
lines changed

4 files changed

+49
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
5-
refs/heads/try: b4f57d46e66c98e571e869926cb9a7466d412e54
5+
refs/heads/try: 1cde7e6bc266af836e0695be7282257838eee05a
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/etc/kate/rust.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
</list>
1818
<list name="keywords">
1919
<item> as </item>
20+
<item> assert </item>
2021
<item> break </item>
2122
<item> const </item>
2223
<item> copy </item>
@@ -68,7 +69,6 @@
6869
<item> Shl </item>
6970
<item> Shr </item>
7071
<item> Index </item>
71-
<item> Not </item>
7272
</list>
7373
<list name="types">
7474
<item> bool </item>

branches/try/src/libcore/clone.rs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,31 @@ impl Clone for () {
1919
#[inline(always)]
2020
fn clone(&self) -> () { () }
2121
}
22+
23+
macro_rules! clone_impl(
24+
($t:ty) => {
25+
impl Clone for $t {
26+
#[inline(always)]
27+
fn clone(&self) -> $t { *self }
28+
}
29+
}
30+
)
31+
32+
clone_impl!(int)
33+
clone_impl!(i8)
34+
clone_impl!(i16)
35+
clone_impl!(i32)
36+
clone_impl!(i64)
37+
38+
clone_impl!(uint)
39+
clone_impl!(u8)
40+
clone_impl!(u16)
41+
clone_impl!(u32)
42+
clone_impl!(u64)
43+
44+
clone_impl!(float)
45+
clone_impl!(f32)
46+
clone_impl!(f64)
47+
48+
clone_impl!(bool)
49+
clone_impl!(char)

branches/try/src/test/run-pass/deriving-clone-struct.rs

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,24 @@
11
#[deriving_clone]
22
struct S {
3-
foo: (),
4-
bar: ()
3+
_int: int,
4+
_i8: i8,
5+
_i16: i16,
6+
_i32: i32,
7+
_i64: i64,
8+
9+
_uint: uint,
10+
_u8: u8,
11+
_u16: u16,
12+
_u32: u32,
13+
_u64: u64,
14+
15+
_float: float,
16+
_f32: f32,
17+
_f64: f64,
18+
19+
_bool: bool,
20+
_char: char,
21+
_nil: ()
522
}
623

724
fn main() {}
8-

0 commit comments

Comments
 (0)