Skip to content

Commit 64f6410

Browse files
committed
---
yaml --- r: 176623 b: refs/heads/tmp c: d47a113 h: refs/heads/master i: 176621: fd6dc3e 176619: cdeeec2 176615: 93cceb4 176607: 50d6e46 v: v3
1 parent 6162687 commit 64f6410

File tree

2 files changed

+2
-21
lines changed

2 files changed

+2
-21
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3434
refs/heads/beta: 44a287e6eb22ec3c2a687fc156813577464017f7
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
37-
refs/heads/tmp: 7b4c50821a62bd6cd0df6810cd07db363bd003ac
37+
refs/heads/tmp: d47a11353d2c254d4644b998b81779887e525bee

branches/tmp/src/librustc/middle/ty.rs

Lines changed: 1 addition & 20 deletions
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)