From 106e011511bf216423a6f9bf91b54aeae28a0644 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 26 Feb 2017 15:41:32 +0100 Subject: [PATCH] bump syntex_* to 0.58 Signed-off-by: Igor Gnatenko --- Cargo.toml | 4 ++-- src/patterns.rs | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 049f85134d6..3d076ad5763 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,8 +23,8 @@ regex = "0.2" term = "0.4" strings = "0.0.1" diff = "0.1" -syntex_syntax = "0.56" -syntex_errors = "0.56" +syntex_syntax = "0.58" +syntex_errors = "0.58" log = "0.3" env_logger = "0.4" getopts = "0.2" diff --git a/src/patterns.rs b/src/patterns.rs index ba642493bdd..cbaa29a4569 100644 --- a/src/patterns.rs +++ b/src/patterns.rs @@ -18,7 +18,7 @@ use types::{rewrite_path, PathContext}; use super::Spanned; use comment::FindUncommented; -use syntax::ast::{self, BindingMode, Pat, PatKind, FieldPat}; +use syntax::ast::{self, BindingMode, Pat, PatKind, FieldPat, RangeEnd}; use syntax::ptr; use syntax::codemap::{self, BytePos, Span}; @@ -56,8 +56,15 @@ impl Rewrite for Pat { None } } - PatKind::Range(ref lhs, ref rhs) => { - rewrite_pair(&**lhs, &**rhs, "", "...", "", context, shape) + PatKind::Range(ref lhs, ref rhs, ref end_kind) => { + match *end_kind { + RangeEnd::Included => { + rewrite_pair(&**lhs, &**rhs, "", "...", "", context, shape) + } + RangeEnd::Excluded => { + rewrite_pair(&**lhs, &**rhs, "", "..", "", context, shape) + } + } } PatKind::Ref(ref pat, mutability) => { let prefix = format!("&{}", format_mutability(mutability));