about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNick Cameron <ncameron@mozilla.com>2015-01-02 23:20:46 +1300
committerNick Cameron <ncameron@mozilla.com>2015-01-02 23:20:46 +1300
commitdc53461a983ec4f5bc50291e71bfc67fd3d2d815 (patch)
treea68c8b059413ad2bc7b29fce6441be9a81b9c4b9
parent30e149231c627e61524d1b5bd6357886befae9e6 (diff)
downloadrust-dc53461a983ec4f5bc50291e71bfc67fd3d2d815.tar.gz
rust-dc53461a983ec4f5bc50291e71bfc67fd3d2d815.zip
Rebasing
-rw-r--r--src/test/compile-fail/associated-types-issue-20346.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/compile-fail/associated-types-issue-20346.rs b/src/test/compile-fail/associated-types-issue-20346.rs
index 255b8a25a4c..e4364b12580 100644
--- a/src/test/compile-fail/associated-types-issue-20346.rs
+++ b/src/test/compile-fail/associated-types-issue-20346.rs
@@ -14,7 +14,7 @@
 #![feature(associated_types)]
 #![no_implicit_prelude]
 
-use std::option::Option::{None, Some, mod};
+use std::option::Option::{self, None, Some};
 use std::vec::Vec;
 
 trait Iterator {