From dc53461a983ec4f5bc50291e71bfc67fd3d2d815 Mon Sep 17 00:00:00 2001
From: Nick Cameron <ncameron@mozilla.com>
Date: Fri, 2 Jan 2015 23:20:46 +1300
Subject: [PATCH] Rebasing

---
 src/test/compile-fail/associated-types-issue-20346.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 {