Skip to content

Commit 78d3d01

Browse files
committed
---
yaml --- r: 142765 b: refs/heads/try2 c: 3b91181 h: refs/heads/master i: 142763: b1987f1 v: v3
1 parent 12a0a99 commit 78d3d01

File tree

5 files changed

+4
-6
lines changed

5 files changed

+4
-6
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: 86b6e6e2f5529cc7c806622fabc5ea56f49a3316
8+
refs/heads/try2: 3b911816ecacf2e80f4faaadeb577743e9070f7f
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/graph.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ be indexed by the direction (see the type `Direction`).
3434
3535
*/
3636

37-
use std::prelude::*;
3837
use std::uint;
3938
use std::vec;
4039

branches/try2/src/librustc/middle/trans/meth.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,6 @@ pub fn trans_trait_callee_from_llval(bcx: block,
548548

549549
let _icx = push_ctxt("impl::trans_trait_callee");
550550
let ccx = bcx.ccx();
551-
let bcx = bcx;
552551

553552
// Load the vtable from the @Trait pair
554553
debug!("(translating trait callee) loading vtable from pair %s",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,9 +372,9 @@ impl ErrorReporting for InferCtxt {
372372
sup,
373373
"");
374374
}
375-
infer::ReferenceOutlivesReferent(ty, _) => {
375+
infer::ReferenceOutlivesReferent(ty, span) => {
376376
self.tcx.sess.span_err(
377-
origin.span(),
377+
span,
378378
fmt!("in type `%s`, pointer has a longer lifetime than \
379379
the data it references",
380380
ty.user_string(self.tcx)));

branches/try2/src/librustc/util/ppaux.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ impl Repr for typeck::method_param {
752752
}
753753

754754
impl Repr for ty::RegionVid {
755-
fn repr(&self, tcx: ctxt) -> ~str {
755+
fn repr(&self, _tcx: ctxt) -> ~str {
756756
fmt!("%?", *self)
757757
}
758758
}

0 commit comments

Comments
 (0)