Skip to content

Commit 85dbc6e

Browse files
committed
---
yaml --- r: 174743 b: refs/heads/snap-stage3 c: d47a113 h: refs/heads/master i: 174741: 4f8163c 174739: 2407ceb 174735: db8bb5a v: v3
1 parent f677b94 commit 85dbc6e

File tree

2 files changed

+2
-21
lines changed

2 files changed

+2
-21
lines changed

[refs]

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: a0f86de49748b472d4d189d9688b0d856c000914
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 7b4c50821a62bd6cd0df6810cd07db363bd003ac
4+
refs/heads/snap-stage3: d47a11353d2c254d4644b998b81779887e525bee
55
refs/heads/try: 08f6380a9f0b866796080094f44fe25ea5636547
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/librustc/middle/ty.rs

+1-20
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ use util::nodemap::{FnvHashMap};
7070
use arena::TypedArena;
7171
use std::borrow::{BorrowFrom, Cow};
7272
use std::cell::{Cell, RefCell};
73-
use std::cmp::{self, Ordering};
73+
use std::cmp;
7474
use std::fmt::{self, Show};
7575
use std::hash::{Hash, Writer, SipHasher, Hasher};
7676
use std::mem;
@@ -5096,25 +5096,6 @@ pub fn associated_type_parameter_index(cx: &ctxt,
50965096
cx.sess.bug("couldn't find associated type parameter index")
50975097
}
50985098

5099-
#[derive(Copy, PartialEq, Eq)]
5100-
pub struct AssociatedTypeInfo {
5101-
pub def_id: ast::DefId,
5102-
pub index: uint,
5103-
pub name: ast::Name,
5104-
}
5105-
5106-
impl PartialOrd for AssociatedTypeInfo {
5107-
fn partial_cmp(&self, other: &AssociatedTypeInfo) -> Option<Ordering> {
5108-
Some(self.index.cmp(&other.index))
5109-
}
5110-
}
5111-
5112-
impl Ord for AssociatedTypeInfo {
5113-
fn cmp(&self, other: &AssociatedTypeInfo) -> Ordering {
5114-
self.index.cmp(&other.index)
5115-
}
5116-
}
5117-
51185099
pub fn trait_item_def_ids(cx: &ctxt, id: ast::DefId)
51195100
-> Rc<Vec<ImplOrTraitItemId>> {
51205101
lookup_locally_or_in_crate_store("trait_item_def_ids",

0 commit comments

Comments
 (0)