Skip to content

Commit e2bdafd

Browse files
committed
---
yaml --- r: 271799 b: refs/heads/auto c: 861644f h: refs/heads/master i: 271797: b4a4865 271795: c4b89d7 271791: 092e309
1 parent ff37046 commit e2bdafd

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
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: 9f899a66591c1a4bc68b51fc6d1f207d2d49a087
11+
refs/heads/auto: 861644f2af5421f5aa55d4e7fddfc8dba54bcb70
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/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/auto/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/auto/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/auto/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)