---

yaml
---
r: 35270
b: refs/heads/master
c: 42c2c2a
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b9f9ab8f7775039e02cbe38c270c81e893da8e2b
+refs/heads/master: 42c2c2ab2f4dfa350dd01d33025cd5027a358d33
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/src/libsyntax/parse.rs

@@ -153,17 +153,6 @@ fn new_parser_from_file(sess: parse_sess, cfg: ast::crate_cfg,
     match io::read_whole_file_str(path) {
       result::Ok(move src) => {
 
-          // HACK: If the file contains a special token use a different
-          // source file. Used to send the stage1+ parser (the stage0 parser
-          // doesn't have this hack) to a different crate file.
-          // Transitional. Remove me.
-          let src = if src.starts_with("// DIVERT") {
-              let actual_path = &path.with_filestem("alternate_crate");
-              result::unwrap(io::read_whole_file_str(actual_path))
-          } else {
-              move src
-          };
-
           let filemap = sess.cm.new_filemap(path.to_str(), @move src);
           let srdr = lexer::new_string_reader(sess.span_diagnostic, filemap,
                                               sess.interner);