ra_syntax fails to compile with rustc 1.31.0-nightly (96064eb 2018-10-28) #185

Activity

1. alanhdu commented on Nov 5, 2018

   

   alanhdu

   on Nov 5, 2018

   Last edited by alanhdu

   Contributor

   More actions

   Not sure how much this helps, but the following diff makes this ICE go away.

   diff --git a/crates/ra_syntax/src/grammar/expressions/mod.rs b/crates/ra_syntax/src/grammar/expressions/mod.rs
   index 60c8602..38dc518 100644
   --- a/crates/ra_syntax/src/grammar/expressions/mod.rs
   +++ b/crates/ra_syntax/src/grammar/expressions/mod.rs
   @@ -1,7 +1,7 @@
    mod atom;
    
    pub(crate) use self::atom::match_arm_list;
   -pub(super) use self::atom::{literal, LITERAL_FIRST};
   +pub(super) use self::atom::LITERAL_FIRST;
    use super::*;
    
    const EXPR_FIRST: TokenSet = LHS_FIRST;
   diff --git a/crates/ra_syntax/src/grammar/patterns.rs b/crates/ra_syntax/src/grammar/patterns.rs
   index 10fa0e0..3f61886 100644
   --- a/crates/ra_syntax/src/grammar/patterns.rs
   +++ b/crates/ra_syntax/src/grammar/patterns.rs
   @@ -49,9 +49,6 @@ fn atom_pat(p: &mut Parser, recovery_set: TokenSet) -> Option<CompletedMarker> {
        //         "hello" => (),
        //     }
        // }
   -    if let Some(m) = expressions::literal(p) {
   -        return Some(m);
   -    }
    
        let m = match la0 {
            UNDERSCORE => placeholder_pat(p),
2. DJMcNab commented on Dec 9, 2018

   

   DJMcNab

   on Dec 9, 2018

   Contributor

   More actions

   I think this was fixed by rust-lang/rust#56143. It builds on 1.31 on stable anyway.
3. matklad

   closed this as completedon Dec 9, 2018