Skip to content

Commit 286a4a0

Browse files
author
blake2-ppc
committed
---
yaml --- r: 144917 b: refs/heads/try2 c: 5f69a58 h: refs/heads/master i: 144915: 60c5648 v: v3
1 parent 0cfd1c6 commit 286a4a0

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 77dff93a4baa4164311e14763cfcbb05e410359b
8+
refs/heads/try2: 5f69a58e0ccf3d85b5f12f26ecf78ee7e7fec270
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/typeck/infer/combine.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ pub trait Combine {
8888
// future we could allow type parameters to declare a
8989
// variance.
9090

91-
if vec::same_length(as_, bs) {
91+
if as_.len() == bs.len() {
9292
result::fold_(as_.iter().zip(bs.iter())
9393
.map(|(a, b)| eq_tys(self, *a, *b)))
9494
.then(|| Ok(as_.to_owned()))
@@ -419,7 +419,7 @@ pub fn super_fn_sigs<C:Combine>(
419419
this: &C, a: &ty::FnSig, b: &ty::FnSig) -> cres<ty::FnSig> {
420420

421421
fn argvecs<C:Combine>(this: &C, a_args: &[ty::t], b_args: &[ty::t]) -> cres<~[ty::t]> {
422-
if vec::same_length(a_args, b_args) {
422+
if a_args.len() == b_args.len() {
423423
result::collect(a_args.iter().zip(b_args.iter())
424424
.map(|(a, b)| this.args(*a, *b)))
425425
} else {

branches/try2/src/libstd/vec.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,6 @@ use unstable::raw::{Box, Repr, Slice, Vec};
123123
use vec;
124124
use util;
125125

126-
/// Returns true if two vectors have the same length
127-
pub fn same_length<T, U>(xs: &[T], ys: &[U]) -> bool {
128-
xs.len() == ys.len()
129-
}
130-
131126
/**
132127
* Creates and initializes an owned vector.
133128
*

0 commit comments

Comments
 (0)