Merge pull request #221 from ruuda/rust113

Restore Rust 1.13 compatibility

.travis.yml

@@ -1,6 +1,6 @@
 language: rust
 rust:
-  - stable
+  - 1.16.0
   - beta
   - nightly
 script:

lalrpop-test/src/main.rs

@@ -422,7 +422,7 @@ fn generics_issue_104_test1() {
 }
 
 #[test]
-fn match_section() {
+fn test_match_section() {
     assert!(match_section::parse_Query("SELECT foo").is_ok());
     assert!(match_section::parse_Query("select foo").is_ok());
     assert!(match_section::parse_Query("INSERT foo").is_ok());

lalrpop/src/lr1/lane_table/construct/merge.rs

@@ -1,6 +1,8 @@
-use super::*;
-
-use collections::Multimap;
+use collections::{Map, Multimap, Set};
+use ena::unify::UnificationTable;
+use lr1::core::{Action, LR1State, StateIndex};
+use lr1::lane_table::construct::state_set::StateSet;
+use lr1::lane_table::table::LaneTable;
 use lr1::lane_table::table::context_set::ContextSet;
 
 /// The "merge" phase of the algorithm is described in "Step 3c" of

lalrpop/src/lr1/lane_table/construct/mod.rs

@@ -28,7 +28,7 @@ pub struct LaneTableConstruct<'grammar> {
 impl<'grammar> LaneTableConstruct<'grammar> {
     pub fn new(grammar: &'grammar Grammar, start_nt: NonterminalString) -> Self {
         let first_sets = FirstSets::new(grammar);
-        Self {
+        LaneTableConstruct {
             grammar: grammar,
             start_nt: start_nt,
             first_sets: first_sets,