Skip to content

Commit 7fb6547

Browse files
committed
---
yaml --- r: 272825 b: refs/heads/beta c: bd3197c h: refs/heads/master i: 272823: b01a101
1 parent 54a6fbf commit 7fb6547

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
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: d792183fdeea5623c7ec909d5aa2eccf9171582c
26+
refs/heads/beta: bd3197c748e7bfa652fb636fbb78fa7a42d826ca
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/libcore/ops.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1468,7 +1468,7 @@ pub trait IndexMut<Idx: ?Sized>: Index<Idx> {
14681468

14691469
/// An unbounded range.
14701470
#[derive(Copy, Clone, PartialEq, Eq)]
1471-
#[lang = "range_full"]
1471+
#[cfg_attr(stage0, lang = "range_full")] // TODO remove attribute after next snapshot
14721472
#[stable(feature = "rust1", since = "1.0.0")]
14731473
pub struct RangeFull;
14741474

@@ -1481,7 +1481,7 @@ impl fmt::Debug for RangeFull {
14811481

14821482
/// A (half-open) range which is bounded at both ends.
14831483
#[derive(Clone, PartialEq, Eq)]
1484-
#[lang = "range"]
1484+
#[cfg_attr(stage0, lang = "range")] // TODO remove attribute after next snapshot
14851485
#[stable(feature = "rust1", since = "1.0.0")]
14861486
pub struct Range<Idx> {
14871487
/// The lower bound of the range (inclusive).
@@ -1501,7 +1501,7 @@ impl<Idx: fmt::Debug> fmt::Debug for Range<Idx> {
15011501

15021502
/// A range which is only bounded below.
15031503
#[derive(Clone, PartialEq, Eq)]
1504-
#[lang = "range_from"]
1504+
#[cfg_attr(stage0, lang = "range_from")] // TODO remove attribute after next snapshot
15051505
#[stable(feature = "rust1", since = "1.0.0")]
15061506
pub struct RangeFrom<Idx> {
15071507
/// The lower bound of the range (inclusive).
@@ -1518,7 +1518,7 @@ impl<Idx: fmt::Debug> fmt::Debug for RangeFrom<Idx> {
15181518

15191519
/// A range which is only bounded above.
15201520
#[derive(Copy, Clone, PartialEq, Eq)]
1521-
#[lang = "range_to"]
1521+
#[cfg_attr(stage0, lang = "range_to")] // TODO remove attribute after next snapshot
15221522
#[stable(feature = "rust1", since = "1.0.0")]
15231523
pub struct RangeTo<Idx> {
15241524
/// The upper bound of the range (exclusive).

branches/beta/src/librustc/middle/lang_items.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -302,10 +302,6 @@ lets_do_this! {
302302
ShrAssignTraitLangItem, "shr_assign", shr_assign_trait;
303303
IndexTraitLangItem, "index", index_trait;
304304
IndexMutTraitLangItem, "index_mut", index_mut_trait;
305-
RangeStructLangItem, "range", range_struct;
306-
RangeFromStructLangItem, "range_from", range_from_struct;
307-
RangeToStructLangItem, "range_to", range_to_struct;
308-
RangeFullStructLangItem, "range_full", range_full_struct;
309305

310306
UnsafeCellTypeLangItem, "unsafe_cell", unsafe_cell_type;
311307

branches/beta/src/librustc_typeck/diagnostics.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3643,8 +3643,8 @@ register_diagnostics! {
36433643
// E0233,
36443644
// E0234,
36453645
// E0235, // structure constructor specifies a structure of type but
3646-
E0236, // no lang item for range syntax
3647-
E0237, // no lang item for range syntax
3646+
// E0236, // no lang item for range syntax
3647+
// E0237, // no lang item for range syntax
36483648
E0238, // parenthesized parameters may only be used with a trait
36493649
// E0239, // `next` method of `Iterator` trait has unexpected type
36503650
// E0240,

0 commit comments

Comments
 (0)