Skip to content

Commit e638db6

Browse files
committed
---
yaml --- r: 273719 b: refs/heads/beta c: 861644f h: refs/heads/master i: 273717: 73d5ca3 273715: 31853d7 273711: 710d65a
1 parent d645c28 commit e638db6

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 9f899a66591c1a4bc68b51fc6d1f207d2d49a087
26+
refs/heads/beta: 861644f2af5421f5aa55d4e7fddfc8dba54bcb70
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_front/lowering.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ impl<'a, 'hir> LoweringContext<'a> {
142142
}
143143
}
144144

145-
// panics if this LoweringContext's NodeIdAssigner is not a Session
145+
// Panics if this LoweringContext's NodeIdAssigner is not able to emit diagnostics.
146146
fn diagnostic(&self) -> &Handler {
147147
self.id_assigner.diagnostic()
148148
}

branches/beta/src/libsyntax/parse/parser.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2076,8 +2076,8 @@ impl<'a> Parser<'a> {
20762076
if end.is_none() && limits == RangeLimits::Closed {
20772077
Err(self.span_fatal_help(self.span,
20782078
"inclusive range with no end",
2079-
"currently, inclusive ranges must be bounded at the end \
2080-
(`...b` or `a...b`) -- see tracking issue #28237"))
2079+
"inclusive ranges must be bounded at the end \
2080+
(`...b` or `a...b`)"))
20812081
} else {
20822082
Ok(ExprKind::Range(start, end, limits))
20832083
}
@@ -3016,7 +3016,8 @@ impl<'a> Parser<'a> {
30163016
this.parse_assoc_expr_with(op.precedence() + 1,
30173017
LhsExpr::NotYetParsed)
30183018
}),
3019-
// no operators are currently handled here
3019+
// We currently have no non-associative operators that are not handled above by
3020+
// the special cases. The code is here only for future convenience.
30203021
Fixity::None => self.with_res(
30213022
restrictions - Restrictions::RESTRICTION_STMT_EXPR,
30223023
|this| {

branches/beta/src/test/compile-fail/impossible_range.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ pub fn main() {
1919
0..1;
2020

2121
...; //~ERROR inclusive range with no end
22-
//~^HELP 28237
22+
//~^HELP bounded at the end
2323
0...; //~ERROR inclusive range with no end
24-
//~^HELP 28237
24+
//~^HELP bounded at the end
2525
...1;
2626
0...1;
2727
}

branches/beta/src/test/parse-fail/range_inclusive.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414

1515
pub fn main() {
1616
for _ in 1... {} //~ERROR inclusive range with no end
17-
//~^HELP 28237
17+
//~^HELP bounded at the end
1818
}
1919

0 commit comments

Comments
 (0)