Skip to content

Commit 5a315d7

Browse files
committed
---
yaml --- r: 220868 b: refs/heads/auto c: 6b10efc h: refs/heads/master v: v3
1 parent dbe93e4 commit 5a315d7

File tree

3 files changed

+31
-3
lines changed

3 files changed

+31
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: 7d984ef6df64de8d7882912ccae16d39ded59a21
11+
refs/heads/auto: 6b10efcc8b2cf9813efca5c0be3aaebf848fb82f
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/libcollections/borrow.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ impl<'a, B: ?Sized> Clone for Cow<'a, B> where B: ToOwned {
215215
impl<'a, B: ?Sized> Cow<'a, B> where B: ToOwned {
216216
/// Acquires a mutable reference to the owned form of the data.
217217
///
218-
/// Copies the data if it is not already owned.
218+
/// Clones the data if it is not already owned.
219219
///
220220
/// # Examples
221221
///
@@ -241,7 +241,7 @@ impl<'a, B: ?Sized> Cow<'a, B> where B: ToOwned {
241241

242242
/// Extracts the owned data.
243243
///
244-
/// Copies the data if it is not already owned.
244+
/// Clones the data if it is not already owned.
245245
///
246246
/// # Examples
247247
///
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
trait SomeTrait {}
12+
struct Meow;
13+
impl SomeTrait for Meow {}
14+
15+
struct Foo<'a> {
16+
x: &'a SomeTrait,
17+
y: &'a SomeTrait,
18+
}
19+
20+
impl<'a> Foo<'a> {
21+
pub fn new<'b>(x: &'b SomeTrait, y: &'b SomeTrait) -> Foo<'b> { Foo { x: x, y: y } }
22+
}
23+
24+
fn main() {
25+
let r = Meow;
26+
let s = Meow;
27+
let q = Foo::new(&r as &SomeTrait, &s as &SomeTrait);
28+
}

0 commit comments

Comments
 (0)