Skip to content

Commit ad7e073

Browse files
committed
---
yaml --- r: 81691 b: refs/heads/master c: 2df5a13 h: refs/heads/master i: 81689: bb5ea6e 81687: db11624 v: v3
1 parent 1e687a4 commit ad7e073

File tree

4 files changed

+23
-12
lines changed

4 files changed

+23
-12
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: 9051a35fc827690fde9312e6789886024bb443b2
2+
refs/heads/master: 2df5a13334449c26204333e8b2cdce2dd0cf90eb
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
55
refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729

trunk/doc/tutorial.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,9 @@ recommended.
6363

6464
Since the Rust compiler is written in Rust, it must be built by
6565
a precompiled "snapshot" version of itself (made in an earlier state
66-
of development). The source build automatically fetches these snapshots
67-
from the Internet on our supported platforms.
66+
of development). As such, source builds require a connection to
67+
the Internet, to fetch snapshots, and an OS that can execute the
68+
available snapshot binaries.
6869

6970
Snapshot binaries are currently built and tested on several platforms:
7071

trunk/src/libextra/future.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,6 @@ pub struct Future<A> {
3737
priv state: FutureState<A>,
3838
}
3939

40-
// n.b. It should be possible to get rid of this.
41-
// Add a test, though -- tjc
42-
// FIXME(#2829) -- futures should not be copyable, because they close
43-
// over ~fn's that have pipes and so forth within!
44-
#[unsafe_destructor]
45-
impl<A> Drop for Future<A> {
46-
fn drop(&mut self) {}
47-
}
48-
4940
enum FutureState<A> {
5041
Pending(~fn() -> A),
5142
Evaluating,
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Copyright 2013 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+
extern mod extra;
12+
13+
use extra::future;
14+
15+
fn main() {
16+
let f = future::from_value(());
17+
let g = f;
18+
f.unwrap(); //~ ERROR use of moved value
19+
}

0 commit comments

Comments
 (0)