Skip to content

Commit 7a588ce

Browse files
eddybeddyb
committed
Rename a few typeck method-related structures to UpperCamelCase.
1 parent 6c41f99 commit 7a588ce

File tree

22 files changed

+115
-119
lines changed

22 files changed

+115
-119
lines changed

‎src/librustc/middle/astencode.rs

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ use writer = serialize::ebml::writer;
5050
// Auxiliary maps of things to be encoded
5151
pub struct Maps {
5252
root_map: middle::borrowck::root_map,
53-
method_map: middle::typeck::method_map,
53+
method_map: middle::typeck::MethodMap,
5454
vtable_map: middle::typeck::vtable_map,
5555
capture_map: middle::moves::CaptureMap,
5656
}
@@ -579,25 +579,23 @@ impl tr for moves::CaptureVar {
579579
impl tr for method_origin {
580580
fn tr(&self, xcx: @ExtendedDecodeContext) -> method_origin {
581581
match *self {
582-
typeck::method_static(did) => {
583-
typeck::method_static(did.tr(xcx))
584-
}
585-
typeck::method_param(ref mp) => {
586-
typeck::method_param(
587-
typeck::method_param {
588-
trait_id: mp.trait_id.tr(xcx),
589-
.. *mp
590-
}
591-
)
592-
}
593-
typeck::method_object(ref mo) => {
594-
typeck::method_object(
595-
typeck::method_object {
596-
trait_id: mo.trait_id.tr(xcx),
597-
.. *mo
598-
}
599-
)
600-
}
582+
typeck::MethodStatic(did) => typeck::MethodStatic(did.tr(xcx)),
583+
typeck::MethodParam(ref mp) => {
584+
typeck::MethodParam(
585+
typeck::MethodParam {
586+
trait_id: mp.trait_id.tr(xcx),
587+
.. *mp
588+
}
589+
)
590+
}
591+
typeck::MethodObject(ref mo) => {
592+
typeck::MethodObject(
593+
typeck::MethodObject {
594+
trait_id: mo.trait_id.tr(xcx),
595+
.. *mo
596+
}
597+
)
598+
}
601599
}
602600
}
603601
}

‎src/librustc/middle/borrowck/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ impl Visitor<()> for BorrowckCtxt {
7070
}
7171

7272
pub fn check_crate(tcx: ty::ctxt,
73-
method_map: typeck::method_map,
73+
method_map: typeck::MethodMap,
7474
moves_map: moves::MovesMap,
7575
moved_variables_set: moves::MovedVariablesSet,
7676
capture_map: moves::CaptureMap,
@@ -156,7 +156,7 @@ fn borrowck_fn(this: &mut BorrowckCtxt,
156156

157157
pub struct BorrowckCtxt {
158158
tcx: ty::ctxt,
159-
method_map: typeck::method_map,
159+
method_map: typeck::MethodMap,
160160
moves_map: moves::MovesMap,
161161
moved_variables_set: moves::MovedVariablesSet,
162162
capture_map: moves::CaptureMap,
@@ -909,7 +909,7 @@ impl Repr for LoanPath {
909909

910910
struct TcxTyper {
911911
tcx: ty::ctxt,
912-
method_map: typeck::method_map,
912+
method_map: typeck::MethodMap,
913913
}
914914

915915
impl mc::Typer for TcxTyper {

‎src/librustc/middle/borrowck/move_data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ impl MoveData {
565565
impl FlowedMoveData {
566566
pub fn new(move_data: MoveData,
567567
tcx: ty::ctxt,
568-
method_map: typeck::method_map,
568+
method_map: typeck::MethodMap,
569569
id_range: ast_util::IdRange,
570570
body: &ast::Block)
571571
-> FlowedMoveData {

‎src/librustc/middle/cfg/construct.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use syntax::opt_vec;
1919

2020
struct CFGBuilder {
2121
tcx: ty::ctxt,
22-
method_map: typeck::method_map,
22+
method_map: typeck::MethodMap,
2323
exit_map: HashMap<ast::NodeId, CFGIndex>,
2424
graph: CFGGraph,
2525
loop_scopes: ~[LoopScope],
@@ -32,7 +32,7 @@ struct LoopScope {
3232
}
3333

3434
pub fn construct(tcx: ty::ctxt,
35-
method_map: typeck::method_map,
35+
method_map: typeck::MethodMap,
3636
blk: &ast::Block) -> CFG {
3737
let mut cfg_builder = CFGBuilder {
3838
exit_map: HashMap::new(),

‎src/librustc/middle/cfg/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pub struct CFGIndices {
5454

5555
impl CFG {
5656
pub fn new(tcx: ty::ctxt,
57-
method_map: typeck::method_map,
57+
method_map: typeck::MethodMap,
5858
blk: &ast::Block) -> CFG {
5959
construct::construct(tcx, method_map, blk)
6060
}

‎src/librustc/middle/check_const.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use syntax::visit;
2323
struct CheckCrateVisitor {
2424
sess: Session,
2525
def_map: resolve::DefMap,
26-
method_map: typeck::method_map,
26+
method_map: typeck::MethodMap,
2727
tcx: ty::ctxt,
2828
}
2929

@@ -43,7 +43,7 @@ impl Visitor<bool> for CheckCrateVisitor {
4343
pub fn check_crate(sess: Session,
4444
krate: &Crate,
4545
def_map: resolve::DefMap,
46-
method_map: typeck::method_map,
46+
method_map: typeck::MethodMap,
4747
tcx: ty::ctxt) {
4848
let mut v = CheckCrateVisitor {
4949
sess: sess,
@@ -102,7 +102,7 @@ pub fn check_pat(v: &mut CheckCrateVisitor, p: &Pat, _is_const: bool) {
102102
pub fn check_expr(v: &mut CheckCrateVisitor,
103103
sess: Session,
104104
def_map: resolve::DefMap,
105-
method_map: typeck::method_map,
105+
method_map: typeck::MethodMap,
106106
tcx: ty::ctxt,
107107
e: &Expr,
108108
is_const: bool) {

‎src/librustc/middle/check_match.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use middle::const_eval::{eval_const_expr, const_val, const_bool, const_float};
1515
use middle::pat_util::*;
1616
use middle::ty::*;
1717
use middle::ty;
18-
use middle::typeck::method_map;
18+
use middle::typeck::MethodMap;
1919
use middle::moves;
2020
use util::ppaux::ty_to_str;
2121

@@ -31,7 +31,7 @@ use syntax::visit::{Visitor, FnKind};
3131

3232
struct MatchCheckCtxt {
3333
tcx: ty::ctxt,
34-
method_map: method_map,
34+
method_map: MethodMap,
3535
moves_map: moves::MovesMap
3636
}
3737

@@ -52,7 +52,7 @@ impl Visitor<()> for CheckMatchVisitor {
5252
}
5353

5454
pub fn check_crate(tcx: ty::ctxt,
55-
method_map: method_map,
55+
method_map: MethodMap,
5656
moves_map: moves::MovesMap,
5757
krate: &Crate) {
5858
let cx = @MatchCheckCtxt {tcx: tcx,

‎src/librustc/middle/dataflow.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ use util::ppaux::Repr;
3232
#[deriving(Clone)]
3333
pub struct DataFlowContext<O> {
3434
priv tcx: ty::ctxt,
35-
priv method_map: typeck::method_map,
35+
priv method_map: typeck::MethodMap,
3636

3737
/// the data flow operator
3838
priv oper: O,
@@ -122,7 +122,7 @@ impl<O:DataFlowOperator> pprust::PpAnn for DataFlowContext<O> {
122122

123123
impl<O:DataFlowOperator> DataFlowContext<O> {
124124
pub fn new(tcx: ty::ctxt,
125-
method_map: typeck::method_map,
125+
method_map: typeck::MethodMap,
126126
oper: O,
127127
id_range: IdRange,
128128
bits_per_id: uint) -> DataFlowContext<O> {

‎src/librustc/middle/dead.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ fn should_explore(tcx: ty::ctxt, def_id: ast::DefId) -> bool {
4949

5050
struct MarkSymbolVisitor {
5151
worklist: ~[ast::NodeId],
52-
method_map: typeck::method_map,
52+
method_map: typeck::MethodMap,
5353
tcx: ty::ctxt,
5454
live_symbols: ~HashSet<ast::NodeId>,
5555
}
5656

5757
impl MarkSymbolVisitor {
5858
fn new(tcx: ty::ctxt,
59-
method_map: typeck::method_map,
59+
method_map: typeck::MethodMap,
6060
worklist: ~[ast::NodeId]) -> MarkSymbolVisitor {
6161
MarkSymbolVisitor {
6262
worklist: worklist,
@@ -96,18 +96,18 @@ impl MarkSymbolVisitor {
9696
match method_map.get().find(id) {
9797
Some(&origin) => {
9898
match origin {
99-
typeck::method_static(def_id) => {
99+
typeck::MethodStatic(def_id) => {
100100
match ty::provided_source(self.tcx, def_id) {
101101
Some(p_did) => self.check_def_id(p_did),
102102
None => self.check_def_id(def_id)
103103
}
104104
}
105-
typeck::method_param(typeck::method_param {
105+
typeck::MethodParam(typeck::MethodParam {
106106
trait_id: trait_id,
107107
method_num: index,
108108
..
109109
})
110-
| typeck::method_object(typeck::method_object {
110+
| typeck::MethodObject(typeck::MethodObject {
111111
trait_id: trait_id,
112112
method_num: index,
113113
..
@@ -285,7 +285,7 @@ fn create_and_seed_worklist(tcx: ty::ctxt,
285285
}
286286

287287
fn find_live(tcx: ty::ctxt,
288-
method_map: typeck::method_map,
288+
method_map: typeck::MethodMap,
289289
exported_items: &privacy::ExportedItems,
290290
reachable_symbols: &HashSet<ast::NodeId>,
291291
krate: &ast::Crate)
@@ -408,7 +408,7 @@ impl Visitor<()> for DeadVisitor {
408408
}
409409

410410
pub fn check_crate(tcx: ty::ctxt,
411-
method_map: typeck::method_map,
411+
method_map: typeck::MethodMap,
412412
exported_items: &privacy::ExportedItems,
413413
reachable_symbols: &HashSet<ast::NodeId>,
414414
krate: &ast::Crate) {

‎src/librustc/middle/effect.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/// `unsafe`.
1313
1414
use middle::ty;
15-
use middle::typeck::method_map;
15+
use middle::typeck::MethodMap;
1616
use util::ppaux;
1717

1818
use syntax::ast;
@@ -39,7 +39,7 @@ struct EffectCheckVisitor {
3939
tcx: ty::ctxt,
4040

4141
/// The method map.
42-
method_map: method_map,
42+
method_map: MethodMap,
4343
/// Whether we're in an unsafe context.
4444
unsafe_context: UnsafeContext,
4545
}
@@ -190,9 +190,7 @@ impl Visitor<()> for EffectCheckVisitor {
190190
}
191191
}
192192

193-
pub fn check_crate(tcx: ty::ctxt,
194-
method_map: method_map,
195-
krate: &ast::Crate) {
193+
pub fn check_crate(tcx: ty::ctxt, method_map: MethodMap, krate: &ast::Crate) {
196194
let mut visitor = EffectCheckVisitor {
197195
tcx: tcx,
198196
method_map: method_map,

‎src/librustc/middle/kind.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ use syntax::visit::Visitor;
5353
#[deriving(Clone)]
5454
pub struct Context {
5555
tcx: ty::ctxt,
56-
method_map: typeck::method_map,
56+
method_map: typeck::MethodMap,
5757
}
5858

5959
impl Visitor<()> for Context {
@@ -76,7 +76,7 @@ impl Visitor<()> for Context {
7676
}
7777

7878
pub fn check_crate(tcx: ty::ctxt,
79-
method_map: typeck::method_map,
79+
method_map: typeck::MethodMap,
8080
krate: &Crate) {
8181
let mut ctx = Context {
8282
tcx: tcx,

‎src/librustc/middle/lint.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ struct Context<'a> {
405405
tcx: ty::ctxt,
406406
// maps from an expression id that corresponds to a method call to the
407407
// details of the method to be invoked
408-
method_map: typeck::method_map,
408+
method_map: typeck::MethodMap,
409409
// Items exported by the crate; used by the missing_doc lint.
410410
exported_items: &'a privacy::ExportedItems,
411411
// The id of the current `ast::StructDef` being walked.
@@ -1415,20 +1415,20 @@ fn check_stability(cx: &Context, e: &ast::Expr) {
14151415
match method_map.get().find(&e.id) {
14161416
Some(&origin) => {
14171417
match origin {
1418-
typeck::method_static(def_id) => {
1418+
typeck::MethodStatic(def_id) => {
14191419
// If this implements a trait method, get def_id
14201420
// of the method inside trait definition.
14211421
// Otherwise, use the current def_id (which refers
14221422
// to the method inside impl).
14231423
ty::trait_method_of_method(
14241424
cx.tcx, def_id).unwrap_or(def_id)
14251425
}
1426-
typeck::method_param(typeck::method_param {
1426+
typeck::MethodParam(typeck::MethodParam {
14271427
trait_id: trait_id,
14281428
method_num: index,
14291429
..
14301430
})
1431-
| typeck::method_object(typeck::method_object {
1431+
| typeck::MethodObject(typeck::MethodObject {
14321432
trait_id: trait_id,
14331433
method_num: index,
14341434
..
@@ -1646,7 +1646,7 @@ impl<'a> IdVisitingOperation for Context<'a> {
16461646
}
16471647

16481648
pub fn check_crate(tcx: ty::ctxt,
1649-
method_map: typeck::method_map,
1649+
method_map: typeck::MethodMap,
16501650
exported_items: &privacy::ExportedItems,
16511651
krate: &ast::Crate) {
16521652
let mut cx = Context {

‎src/librustc/middle/liveness.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ impl Visitor<@IrMaps> for LivenessVisitor {
174174
}
175175

176176
pub fn check_crate(tcx: ty::ctxt,
177-
method_map: typeck::method_map,
177+
method_map: typeck::MethodMap,
178178
capture_map: moves::CaptureMap,
179179
krate: &Crate) {
180180
let mut visitor = LivenessVisitor;
@@ -253,7 +253,7 @@ enum VarKind {
253253

254254
struct IrMaps {
255255
tcx: ty::ctxt,
256-
method_map: typeck::method_map,
256+
method_map: typeck::MethodMap,
257257
capture_map: moves::CaptureMap,
258258

259259
num_live_nodes: Cell<uint>,
@@ -266,7 +266,7 @@ struct IrMaps {
266266
}
267267

268268
fn IrMaps(tcx: ty::ctxt,
269-
method_map: typeck::method_map,
269+
method_map: typeck::MethodMap,
270270
capture_map: moves::CaptureMap)
271271
-> IrMaps {
272272
IrMaps {

‎src/librustc/middle/moves.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ and so on.
130130
use middle::pat_util::{pat_bindings};
131131
use middle::freevars;
132132
use middle::ty;
133-
use middle::typeck::method_map;
133+
use middle::typeck::MethodMap;
134134
use util::ppaux;
135135
use util::ppaux::Repr;
136136
use util::common::indenter;
@@ -182,7 +182,7 @@ pub struct MoveMaps {
182182
#[deriving(Clone)]
183183
struct VisitContext {
184184
tcx: ty::ctxt,
185-
method_map: method_map,
185+
method_map: MethodMap,
186186
move_maps: MoveMaps
187187
}
188188

@@ -208,7 +208,7 @@ impl visit::Visitor<()> for VisitContext {
208208
}
209209

210210
pub fn compute_moves(tcx: ty::ctxt,
211-
method_map: method_map,
211+
method_map: MethodMap,
212212
krate: &Crate) -> MoveMaps
213213
{
214214
let mut visit_cx = VisitContext {

0 commit comments

Comments
 (0)