---

yaml
---
r: 62981
b: refs/heads/snap-stage3
c: 3ce75e7
h: refs/heads/master
i:
  62979: d7c9271
v: v3

Author: Blei

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: e1c1c059c6d120d324a0a2d5125363c21ad11940
+refs/heads/snap-stage3: 3ce75e786de9945338c862fd73cc86fd6f892436
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/option.rs

@@ -437,7 +437,7 @@ fn test_option_dance() {
 }
 #[test] #[should_fail] #[ignore(cfg(windows))]
 fn test_option_too_much_dance() {
-    let mut y = Some(util::NonCopyable());
+    let mut y = Some(util::NonCopyable::new());
     let _y2 = y.swap_unwrap();
     let _y3 = y.swap_unwrap();
 }

branches/snap-stage3/src/libstd/util.rs

@@ -79,13 +79,15 @@ pub struct NonCopyable {
     priv i: (),
 }
 
+impl NonCopyable {
+    /// Creates a dummy non-copyable structure and returns it for use.
+    pub fn new() -> NonCopyable { NonCopyable { i: () } }
+}
+
 impl Drop for NonCopyable {
     fn finalize(&self) { }
 }
 
-/// Creates a dummy non-copyable structure and returns it for use.
-pub fn NonCopyable() -> NonCopyable { NonCopyable { i: () } }
-
 
 /// A type with no inhabitants
 pub enum Void { }