2 files changed, 3 insertions, 7 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 28d757e9be9..495c619c273 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -5254,13 +5254,7 @@ impl<'a> Parser<'a> {
                     -> (ast::Item_, Vec<ast::Attribute> ) {
         let mut prefix = PathBuf::new(&self.sess.span_diagnostic.cm
                                            .span_to_filename(self.span));
-        // FIXME(acrichto): right now "a".pop() == "a", but need to confirm with
-        //                  aturon whether this is expected or not.
-        if prefix.parent().is_some() {
-            prefix.pop();
-        } else {
-            prefix = PathBuf::new("");
-        }
+        prefix.pop();
         let mut dir_path = prefix;
         for part in &self.mod_path_stack {
             dir_path.push(&**part);
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index 61a3a5ca82a..17b42e4e05c 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -25,6 +25,7 @@ use serialize::{Decodable, Decoder, Encodable, Encoder};
 use std::fmt;
 use std::mem;
 use std::ops::Deref;
+#[allow(deprecated)]
 use std::old_path::BytesContainer;
 use std::rc::Rc;
 
@@ -638,6 +639,7 @@ impl Deref for InternedString {
     fn deref(&self) -> &str { &*self.string }
 }
 
+#[allow(deprecated)]
 impl BytesContainer for InternedString {
     fn container_as_bytes<'a>(&'a self) -> &'a [u8] {
         // FIXME #12938: This is a workaround for the incorrect signature