diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-06-15 17:45:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-15 17:45:06 +0200 |
| commit | 145abd88ca5a17cae682a643cb9e2c77f19b5a95 (patch) | |
| tree | 58e95ae57df7f90202117b455a5eaeb10e7e2552 /src/libsyntax | |
| parent | eb188f1317feddbf4227d53a5f31fadff3852f03 (diff) | |
| parent | 363940bbe1fd2d1243bf4726756680459601a3b8 (diff) | |
| download | rust-145abd88ca5a17cae682a643cb9e2c77f19b5a95.tar.gz rust-145abd88ca5a17cae682a643cb9e2c77f19b5a95.zip | |
Rollup merge of #61844 - AaronKutch:master, r=Centril
Change `...` to `..=` where applicable
This is mainly to fix #61816, but I decided to manually check a few thousand `...` throughout the code base to check for any other cases. I think I found a documentation bug in `src\libsyntax\ast.rs` where both `1..` and `1...` where mentioned. If there is internal support for both `1..` and `1..=` (that can exist before error handling gets to it), then I can add that back.
There were some other cases that look like `// struct Closure<'l0...'li, T0...Tj, CK, CS, U0...Uk> {`, `// <P0 as Trait<P1...Pn>>::Foo: 'a`, and `assert!(min <= max, "discriminant range is {}...{}", min, max);`, but I am not sure if I should change those.
There are a bunch of cases in the `/test/` directory that could be changed, but I presume I should just leave those be.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/util/parser.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 68cb8c8574d..54cd4035a7b 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -1181,7 +1181,7 @@ pub enum ExprKind { Field(P<Expr>, Ident), /// An indexing operation (e.g., `foo[2]`). Index(P<Expr>, P<Expr>), - /// A range (e.g., `1..2`, `1..`, `..2`, `1...2`, `1...`, `...2`). + /// A range (e.g., `1..2`, `1..`, `..2`, `1..=2`, `..=2`). Range(Option<P<Expr>>, Option<P<Expr>>, RangeLimits), /// Variable reference, possibly containing `::` and/or type diff --git a/src/libsyntax/util/parser.rs b/src/libsyntax/util/parser.rs index 69dd96625cc..fcecee8c57f 100644 --- a/src/libsyntax/util/parser.rs +++ b/src/libsyntax/util/parser.rs @@ -234,7 +234,7 @@ pub const PREC_RESET: i8 = -100; pub const PREC_CLOSURE: i8 = -40; pub const PREC_JUMP: i8 = -30; pub const PREC_RANGE: i8 = -10; -// The range 2 ... 14 is reserved for AssocOp binary operator precedences. +// The range 2..=14 is reserved for AssocOp binary operator precedences. pub const PREC_PREFIX: i8 = 50; pub const PREC_POSTFIX: i8 = 60; pub const PREC_PAREN: i8 = 99; |