Skip to content

Commit 86b7268

Browse files
GuillaumeGomezGuillaumeGomez
committed
---
yaml --- r: 233843 b: refs/heads/beta c: 78feb4d h: refs/heads/master i: 233841: 41b7fee 233839: e9e2dfe v: v3
1 parent 9b72311 commit 86b7268

File tree

30 files changed

+188
-229
lines changed

30 files changed

+188
-229
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 8f28c9b01ee5ff7e73bb81b3364f26b6ad4060a2
26+
refs/heads/beta: 78feb4ddf9144d1333c459750789abae574d99ef
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

‎branches/beta/src/librustc/ast_map/blocks.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use syntax::abi;
2828
use syntax::ast::{Block, FnDecl, NodeId};
2929
use syntax::ast;
3030
use syntax::codemap::Span;
31-
use syntax::visit::FnKind;
31+
use syntax::visit;
3232

3333
/// An FnLikeNode is a Node that is like a fn, in that it has a decl
3434
/// and a body (as well as a NodeId, a span, etc).
@@ -50,7 +50,7 @@ pub trait MaybeFnLike { fn is_fn_like(&self) -> bool; }
5050
pub struct FnParts<'a> {
5151
pub decl: &'a FnDecl,
5252
pub body: &'a Block,
53-
pub kind: FnKind<'a>,
53+
pub kind: visit::FnKind<'a>,
5454
pub span: Span,
5555
pub id: NodeId,
5656
}
@@ -186,15 +186,15 @@ impl<'a> FnLikeNode<'a> {
186186
|c: ClosureParts| c.id)
187187
}
188188

189-
pub fn kind(self) -> FnKind<'a> {
190-
let item = |p: ItemFnParts<'a>| -> FnKind<'a> {
191-
FnKind::ItemFn(p.ident, p.generics, p.unsafety, p.constness, p.abi, p.vis)
189+
pub fn kind(self) -> visit::FnKind<'a> {
190+
let item = |p: ItemFnParts<'a>| -> visit::FnKind<'a> {
191+
visit::FkItemFn(p.ident, p.generics, p.unsafety, p.constness, p.abi, p.vis)
192192
};
193193
let closure = |_: ClosureParts| {
194-
FnKind::Closure
194+
visit::FkClosure
195195
};
196196
let method = |_, ident, sig: &'a ast::MethodSig, vis, _, _| {
197-
FnKind::Method(ident, sig, vis)
197+
visit::FkMethod(ident, sig, vis)
198198
};
199199
self.handle(item, method, closure)
200200
}

‎branches/beta/src/librustc/ast_map/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,6 @@ impl<'ast> Map<'ast> {
480480
NodeImplItem(ii) => PathName(ii.ident.name),
481481
NodeTraitItem(ti) => PathName(ti.ident.name),
482482
NodeVariant(v) => PathName(v.node.name.name),
483-
NodeLifetime(lt) => PathName(lt.name),
484483
_ => panic!("no path elem for {:?}", node)
485484
}
486485
}

‎branches/beta/src/librustc/lint/context.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ use syntax::codemap::Span;
4343
use syntax::visit::{Visitor, FnKind};
4444
use syntax::parse::token::InternedString;
4545
use syntax::{ast, ast_util, visit};
46-
use syntax::diagnostic;
4746

4847
/// Information about the registered lints.
4948
///
@@ -142,7 +141,7 @@ impl LintStore {
142141
match (sess, from_plugin) {
143142
// We load builtin lints first, so a duplicate is a compiler bug.
144143
// Use early_error when handling -W help with no crate.
145-
(None, _) => early_error(diagnostic::Auto, &msg[..]),
144+
(None, _) => early_error(&msg[..]),
146145
(Some(sess), false) => sess.bug(&msg[..]),
147146

148147
// A duplicate name from a plugin is a user error.
@@ -167,7 +166,7 @@ impl LintStore {
167166
match (sess, from_plugin) {
168167
// We load builtin lints first, so a duplicate is a compiler bug.
169168
// Use early_error when handling -W help with no crate.
170-
(None, _) => early_error(diagnostic::Auto, &msg[..]),
169+
(None, _) => early_error(&msg[..]),
171170
(Some(sess), false) => sess.bug(&msg[..]),
172171

173172
// A duplicate name from a plugin is a user error.

‎branches/beta/src/librustc/middle/check_const.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use util::nodemap::NodeMap;
3838

3939
use syntax::ast;
4040
use syntax::codemap::Span;
41-
use syntax::visit::{self, FnKind, Visitor};
41+
use syntax::visit::{self, Visitor};
4242

4343
use std::collections::hash_map::Entry;
4444
use std::cmp::Ordering;
@@ -142,7 +142,7 @@ impl<'a, 'tcx> CheckCrateVisitor<'a, 'tcx> {
142142
}
143143

144144
fn fn_like(&mut self,
145-
fk: FnKind,
145+
fk: visit::FnKind,
146146
fd: &ast::FnDecl,
147147
b: &ast::Block,
148148
s: Span,
@@ -157,10 +157,10 @@ impl<'a, 'tcx> CheckCrateVisitor<'a, 'tcx> {
157157
}
158158

159159
let mode = match fk {
160-
FnKind::ItemFn(_, _, _, ast::Constness::Const, _, _) => {
160+
visit::FkItemFn(_, _, _, ast::Constness::Const, _, _) => {
161161
Mode::ConstFn
162162
}
163-
FnKind::Method(_, m, _) => {
163+
visit::FkMethod(_, m, _) => {
164164
if m.constness == ast::Constness::Const {
165165
Mode::ConstFn
166166
} else {
@@ -352,7 +352,7 @@ impl<'a, 'tcx, 'v> Visitor<'v> for CheckCrateVisitor<'a, 'tcx> {
352352
}
353353

354354
fn visit_fn(&mut self,
355-
fk: FnKind<'v>,
355+
fk: visit::FnKind<'v>,
356356
fd: &'v ast::FnDecl,
357357
b: &'v ast::Block,
358358
s: Span,

‎branches/beta/src/librustc/middle/check_match.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ fn check_fn(cx: &mut MatchCheckCtxt,
10071007
sp: Span,
10081008
fn_id: NodeId) {
10091009
match kind {
1010-
FnKind::Closure => {}
1010+
visit::FkClosure => {}
10111011
_ => cx.param_env = ParameterEnvironment::for_item(cx.tcx, fn_id),
10121012
}
10131013

‎branches/beta/src/librustc/middle/const_eval.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
//#![allow(non_camel_case_types)]
11+
#![allow(non_camel_case_types)]
1212

1313
use self::ConstVal::*;
1414
use self::ErrKind::*;
@@ -26,10 +26,10 @@ use middle::astconv_util::ast_ty_to_prim_ty;
2626
use util::num::ToPrimitive;
2727

2828
use syntax::ast::{self, Expr};
29-
use syntax::codemap::{self, Span};
29+
use syntax::codemap::Span;
3030
use syntax::parse::token::InternedString;
3131
use syntax::ptr::P;
32-
use syntax::visit::FnKind;
32+
use syntax::{codemap, visit};
3333

3434
use std::borrow::{Cow, IntoCow};
3535
use std::num::wrapping::OverflowingOps;
@@ -246,10 +246,10 @@ pub fn lookup_const_fn_by_id<'tcx>(tcx: &ty::ctxt<'tcx>, def_id: DefId)
246246
};
247247

248248
match fn_like.kind() {
249-
FnKind::ItemFn(_, _, _, ast::Constness::Const, _, _) => {
249+
visit::FkItemFn(_, _, _, ast::Constness::Const, _, _) => {
250250
Some(fn_like)
251251
}
252-
FnKind::Method(_, m, _) => {
252+
visit::FkMethod(_, m, _) => {
253253
if m.constness == ast::Constness::Const {
254254
Some(fn_like)
255255
} else {

‎branches/beta/src/librustc/middle/effect.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use middle::ty::MethodCall;
1919
use syntax::ast;
2020
use syntax::codemap::Span;
2121
use syntax::visit;
22-
use syntax::visit::{FnKind, Visitor};
22+
use syntax::visit::Visitor;
2323

2424
#[derive(Copy, Clone)]
2525
struct UnsafeContext {
@@ -75,13 +75,13 @@ impl<'a, 'tcx> EffectCheckVisitor<'a, 'tcx> {
7575
}
7676

7777
impl<'a, 'tcx, 'v> Visitor<'v> for EffectCheckVisitor<'a, 'tcx> {
78-
fn visit_fn(&mut self, fn_kind: FnKind<'v>, fn_decl: &'v ast::FnDecl,
78+
fn visit_fn(&mut self, fn_kind: visit::FnKind<'v>, fn_decl: &'v ast::FnDecl,
7979
block: &'v ast::Block, span: Span, _: ast::NodeId) {
8080

8181
let (is_item_fn, is_unsafe_fn) = match fn_kind {
82-
FnKind::ItemFn(_, _, unsafety, _, _, _) =>
82+
visit::FkItemFn(_, _, unsafety, _, _, _) =>
8383
(true, unsafety == ast::Unsafety::Unsafe),
84-
FnKind::Method(_, sig, _) =>
84+
visit::FkMethod(_, sig, _) =>
8585
(true, sig.unsafety == ast::Unsafety::Unsafe),
8686
_ => (false, false),
8787
};

‎branches/beta/src/librustc/middle/intrinsicck.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use std::fmt;
1919
use syntax::abi::RustIntrinsic;
2020
use syntax::ast;
2121
use syntax::codemap::Span;
22-
use syntax::visit::{FnKind, Visitor};
22+
use syntax::visit::Visitor;
2323
use syntax::visit;
2424

2525
pub fn check_crate(tcx: &ctxt) {
@@ -216,16 +216,16 @@ impl<'a, 'tcx> IntrinsicCheckingVisitor<'a, 'tcx> {
216216
}
217217

218218
impl<'a, 'tcx, 'v> Visitor<'v> for IntrinsicCheckingVisitor<'a, 'tcx> {
219-
fn visit_fn(&mut self, fk: FnKind<'v>, fd: &'v ast::FnDecl,
219+
fn visit_fn(&mut self, fk: visit::FnKind<'v>, fd: &'v ast::FnDecl,
220220
b: &'v ast::Block, s: Span, id: ast::NodeId) {
221221
match fk {
222-
FnKind::ItemFn(..) | FnKind::Method(..) => {
222+
visit::FkItemFn(..) | visit::FkMethod(..) => {
223223
let param_env = ty::ParameterEnvironment::for_item(self.tcx, id);
224224
self.param_envs.push(param_env);
225225
visit::walk_fn(self, fk, fd, b, s);
226226
self.param_envs.pop();
227227
}
228-
FnKind::Closure(..) => {
228+
visit::FkClosure(..) => {
229229
visit::walk_fn(self, fk, fd, b, s);
230230
}
231231
}

‎branches/beta/src/librustc/middle/resolve_lifetime.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use syntax::codemap::Span;
3030
use syntax::parse::token::special_idents;
3131
use syntax::print::pprust::lifetime_to_string;
3232
use syntax::visit;
33-
use syntax::visit::{FnKind, Visitor};
33+
use syntax::visit::Visitor;
3434
use util::nodemap::NodeMap;
3535

3636
#[derive(Clone, Copy, PartialEq, Eq, Hash, RustcEncodable, RustcDecodable, Debug)]
@@ -173,20 +173,20 @@ impl<'a, 'v> Visitor<'v> for LifetimeContext<'a> {
173173
replace(&mut self.labels_in_fn, saved);
174174
}
175175

176-
fn visit_fn(&mut self, fk: FnKind<'v>, fd: &'v ast::FnDecl,
176+
fn visit_fn(&mut self, fk: visit::FnKind<'v>, fd: &'v ast::FnDecl,
177177
b: &'v ast::Block, s: Span, _: ast::NodeId) {
178178
match fk {
179-
FnKind::ItemFn(_, generics, _, _, _, _) => {
179+
visit::FkItemFn(_, generics, _, _, _, _) => {
180180
self.visit_early_late(subst::FnSpace, generics, |this| {
181181
this.walk_fn(fk, fd, b, s)
182182
})
183183
}
184-
FnKind::Method(_, sig, _) => {
184+
visit::FkMethod(_, sig, _) => {
185185
self.visit_early_late(subst::FnSpace, &sig.generics, |this| {
186186
this.walk_fn(fk, fd, b, s)
187187
})
188188
}
189-
FnKind::Closure(..) => {
189+
visit::FkClosure(..) => {
190190
self.walk_fn(fk, fd, b, s)
191191
}
192192
}
@@ -470,21 +470,21 @@ impl<'a> LifetimeContext<'a> {
470470
// labels of the function body and swaps them in before visiting
471471
// the function body itself.
472472
fn walk_fn<'b>(&mut self,
473-
fk: FnKind,
473+
fk: visit::FnKind,
474474
fd: &ast::FnDecl,
475475
fb: &'b ast::Block,
476476
_span: Span) {
477477
match fk {
478-
FnKind::ItemFn(_, generics, _, _, _, _) => {
478+
visit::FkItemFn(_, generics, _, _, _, _) => {
479479
visit::walk_fn_decl(self, fd);
480480
self.visit_generics(generics);
481481
}
482-
FnKind::Method(_, sig, _) => {
482+
visit::FkMethod(_, sig, _) => {
483483
visit::walk_fn_decl(self, fd);
484484
self.visit_generics(&sig.generics);
485485
self.visit_explicit_self(&sig.explicit_self);
486486
}
487-
FnKind::Closure(..) => {
487+
visit::FkClosure(..) => {
488488
visit::walk_fn_decl(self, fd);
489489
}
490490
}

‎branches/beta/src/librustc/middle/ty.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1733,7 +1733,7 @@ pub struct FreeRegion {
17331733
}
17341734

17351735
#[derive(Clone, PartialEq, PartialOrd, Eq, Ord, Hash,
1736-
RustcEncodable, RustcDecodable, Copy)]
1736+
RustcEncodable, RustcDecodable, Copy, Debug)]
17371737
pub enum BoundRegion {
17381738
/// An anonymous region parameter for a given fn (&T)
17391739
BrAnon(u32),
@@ -2325,7 +2325,7 @@ pub struct TypeParameterDef<'tcx> {
23252325
pub object_lifetime_default: ObjectLifetimeDefault,
23262326
}
23272327

2328-
#[derive(Clone)]
2328+
#[derive(Clone, Debug)]
23292329
pub struct RegionParameterDef {
23302330
pub name: ast::Name,
23312331
pub def_id: DefId,

0 commit comments

Comments
 (0)