diff options
| author | bors <bors@rust-lang.org> | 2014-12-09 19:12:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-12-09 19:12:02 +0000 |
| commit | b25e100173effba685d076cee16f8af150078617 (patch) | |
| tree | 6c045a3ce5fe575f6e4e4663d4e748780e7416cd /src/libstd/sync | |
| parent | ef4982f0f8643af9e7deede95ad5e4e8df854d66 (diff) | |
| parent | 1a61fe4280b476bb2131f76414c32676b91e163c (diff) | |
| download | rust-b25e100173effba685d076cee16f8af150078617.tar.gz rust-b25e100173effba685d076cee16f8af150078617.zip | |
auto merge of #19665 : alexcrichton/rust/rollup, r=alexcrichton
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/poison.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/poison.rs b/src/libstd/sync/poison.rs index eb46fd77147..ee151556620 100644 --- a/src/libstd/sync/poison.rs +++ b/src/libstd/sync/poison.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use option::None; +use option::Option::None; use rustrt::task::Task; use rustrt::local::Local; |