Skip to content

Commit dca4219

Browse files
committed
---
yaml --- r: 60348 b: refs/heads/master c: 31cedf6 h: refs/heads/master v: v3
1 parent df05faf commit dca4219

File tree

5 files changed

+8
-4
lines changed

5 files changed

+8
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: fa45958ec8362c1157d8d655fc8ec95ba3f811d6
2+
refs/heads/master: 31cedf6927ae4add985995137c394032b599ea1e
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
55
refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589

trunk/src/libcore/clone.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ by convention implementing the `Clone` trait and calling the
2323
*/
2424

2525
pub trait Clone {
26-
/// Return a deep copy of the owned object tree. Types with shared ownership like managed boxes
27-
/// are cloned with a shallow copy.
26+
/// Return a deep copy of the owned object tree. Managed boxes are cloned with a shallow copy.
2827
fn clone(&self) -> Self;
2928
}
3029

@@ -34,7 +33,7 @@ impl Clone for () {
3433
fn clone(&self) -> () { () }
3534
}
3635

37-
impl<T: Clone> Clone for ~T {
36+
impl<T:Clone> Clone for ~T {
3837
/// Return a deep copy of the owned box.
3938
#[inline(always)]
4039
fn clone(&self) -> ~T { ~(**self).clone() }

trunk/src/libcore/to_bytes.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,7 @@ pub fn iter_bytes_2<A:IterBytes,B:IterBytes>(a: &A, b: &B,
458458
b.iter_bytes(lsb0, |bytes| {flag = z(bytes); flag});
459459
}
460460
#[cfg(not(stage0))]
461+
#[inline(always)]
461462
pub fn iter_bytes_2<A:IterBytes,B:IterBytes>(a: &A, b: &B,
462463
lsb0: bool, z: Cb) -> bool {
463464
a.iter_bytes(lsb0, z) && b.iter_bytes(lsb0, z)

trunk/src/libsyntax/ast.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,14 @@ impl<D:Decoder> Decodable<D> for ident {
9898

9999
#[cfg(stage0)]
100100
impl to_bytes::IterBytes for ident {
101+
#[inline(always)]
101102
fn iter_bytes(&self, lsb0: bool, f: to_bytes::Cb) {
102103
self.repr.iter_bytes(lsb0, f)
103104
}
104105
}
105106
#[cfg(not(stage0))]
106107
impl to_bytes::IterBytes for ident {
108+
#[inline(always)]
107109
fn iter_bytes(&self, lsb0: bool, f: to_bytes::Cb) -> bool {
108110
self.repr.iter_bytes(lsb0, f)
109111
}

trunk/src/libsyntax/parse/token.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,12 +357,14 @@ impl<'self> Equiv<@~str> for StringRef<'self> {
357357

358358
#[cfg(stage0)]
359359
impl<'self> to_bytes::IterBytes for StringRef<'self> {
360+
#[inline(always)]
360361
fn iter_bytes(&self, lsb0: bool, f: to_bytes::Cb) {
361362
(**self).iter_bytes(lsb0, f);
362363
}
363364
}
364365
#[cfg(not(stage0))]
365366
impl<'self> to_bytes::IterBytes for StringRef<'self> {
367+
#[inline(always)]
366368
fn iter_bytes(&self, lsb0: bool, f: to_bytes::Cb) -> bool {
367369
(**self).iter_bytes(lsb0, f)
368370
}

0 commit comments

Comments
 (0)