Skip to content

Commit 3ce75e7

Browse files
committed
std::util: Modernize NonCopyable constructor
part of #3853
1 parent e1c1c05 commit 3ce75e7

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/libstd/option.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ fn test_option_dance() {
437437
}
438438
#[test] #[should_fail] #[ignore(cfg(windows))]
439439
fn test_option_too_much_dance() {
440-
let mut y = Some(util::NonCopyable());
440+
let mut y = Some(util::NonCopyable::new());
441441
let _y2 = y.swap_unwrap();
442442
let _y3 = y.swap_unwrap();
443443
}

src/libstd/util.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,15 @@ pub struct NonCopyable {
7979
priv i: (),
8080
}
8181

82+
impl NonCopyable {
83+
/// Creates a dummy non-copyable structure and returns it for use.
84+
pub fn new() -> NonCopyable { NonCopyable { i: () } }
85+
}
86+
8287
impl Drop for NonCopyable {
8388
fn finalize(&self) { }
8489
}
8590

86-
/// Creates a dummy non-copyable structure and returns it for use.
87-
pub fn NonCopyable() -> NonCopyable { NonCopyable { i: () } }
88-
8991

9092
/// A type with no inhabitants
9193
pub enum Void { }

0 commit comments

Comments
 (0)