Skip to content

Commit df2497f

Browse files
vmxsteveklabnik
authored andcommitted
---
yaml --- r: 173951 b: refs/heads/auto c: f12e60a h: refs/heads/master i: 173949: 6d360e3 173947: bca459f 173943: 13bdc87 173935: 731f928 173919: 5144859 173887: dc9739a 173823: 400506a v: v3
1 parent a4e86c6 commit df2497f

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 0109ceaf827461d525ada1a71dcba909071d7cdc
13+
refs/heads/auto: f12e60a5c8bacd8fb43b503000c19187aa3b09c2
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libcore/ops.rs

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -830,28 +830,27 @@ shr_impl_all! { u8 u16 u32 u64 usize i8 i16 i32 i64 isize }
830830
///
831831
/// # Example
832832
///
833-
/// A trivial implementation of `Index`. When `Foo[Foo]` happens, it ends up
833+
/// A trivial implementation of `Index`. When `Foo[Bar]` happens, it ends up
834834
/// calling `index`, and therefore, `main` prints `Indexing!`.
835835
///
836836
/// ```
837-
/// #![feature(associated_types)]
838-
///
839837
/// use std::ops::Index;
840838
///
841839
/// #[derive(Copy)]
842840
/// struct Foo;
841+
/// struct Bar;
843842
///
844-
/// impl Index<Foo> for Foo {
843+
/// impl Index<Bar> for Foo {
845844
/// type Output = Foo;
846845
///
847-
/// fn index<'a>(&'a self, _index: &Foo) -> &'a Foo {
846+
/// fn index<'a>(&'a self, _index: &Bar) -> &'a Foo {
848847
/// println!("Indexing!");
849848
/// self
850849
/// }
851850
/// }
852851
///
853852
/// fn main() {
854-
/// Foo[Foo];
853+
/// Foo[Bar];
855854
/// }
856855
/// ```
857856
#[lang="index"]
@@ -867,28 +866,27 @@ pub trait Index<Index: ?Sized> {
867866
///
868867
/// # Example
869868
///
870-
/// A trivial implementation of `IndexMut`. When `Foo[Foo]` happens, it ends up
869+
/// A trivial implementation of `IndexMut`. When `Foo[Bar]` happens, it ends up
871870
/// calling `index_mut`, and therefore, `main` prints `Indexing!`.
872871
///
873872
/// ```
874-
/// #![feature(associated_types)]
875-
///
876873
/// use std::ops::IndexMut;
877874
///
878875
/// #[derive(Copy)]
879876
/// struct Foo;
877+
/// struct Bar;
880878
///
881-
/// impl IndexMut<Foo> for Foo {
879+
/// impl IndexMut<Bar> for Foo {
882880
/// type Output = Foo;
883881
///
884-
/// fn index_mut<'a>(&'a mut self, _index: &Foo) -> &'a mut Foo {
882+
/// fn index_mut<'a>(&'a mut self, _index: &Bar) -> &'a mut Foo {
885883
/// println!("Indexing!");
886884
/// self
887885
/// }
888886
/// }
889887
///
890888
/// fn main() {
891-
/// &mut Foo[Foo];
889+
/// &mut Foo[Bar];
892890
/// }
893891
/// ```
894892
#[lang="index_mut"]

0 commit comments

Comments
 (0)