Skip to content

Commit 5864cee

Browse files
committed
---
yaml --- r: 118637 b: refs/heads/try c: 19260b0 h: refs/heads/master i: 118635: ce5f00b v: v3
1 parent 2f107cf commit 5864cee

File tree

6 files changed

+297
-406
lines changed

6 files changed

+297
-406
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: b1646cbfd908dc948b251e362669af421100647a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: d6736a1440d42f6af967a8a20ab8d73522112b72
5-
refs/heads/try: af622a491a18c27764199608f927a408af2f317c
5+
refs/heads/try: 19260b043b84dd44e2be26a66771ad621dbf1a59
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/liballoc/owned.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,12 @@ use core::result::{Ok, Err, Result};
2525
///
2626
/// The following two examples are equivalent:
2727
///
28-
/// let foo = box(HEAP) Bar::new(...);
29-
/// let foo = box Bar::new(...);
28+
/// use std::owned::HEAP;
29+
///
30+
/// # struct Bar;
31+
/// # impl Bar { fn new(_a: int) { } }
32+
/// let foo = box(HEAP) Bar::new(2);
33+
/// let foo = box Bar::new(2);
3034
#[lang="exchange_heap"]
3135
pub static HEAP: () = ();
3236

branches/try/src/libcore/failure.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
//! useful an upstream crate must define failure for libcore to use. The current
1616
//! interface for failure is:
1717
//!
18-
//! fn begin_unwind(fmt: &fmt::Arguments, file: &str, line: uint) -> !;
18+
//! ```ignore
19+
//! fn begin_unwind(fmt: &fmt::Arguments, file: &str, line: uint) -> !;
20+
//! ```
1921
//!
2022
//! This definition allows for failing with any general message, but it does not
2123
//! allow for failing with a `~Any` value. The reason for this is that libcore

0 commit comments

Comments
 (0)