user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change 'iface' to 'trait' internally; parse trait as iface synonym

Browse source
This commit is contained in:
Lindsey Kuper 2012-07-03 16:30:42 -07:00
parent d93f3c5d83
commit 33334f3c43
49 changed files with 453 additions and 451 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/rustc/middle/astencode.rs
View file

@ -395,10 +395,10 @@ impl of tr for method_origin {
typeck::method_static(did.tr(xcx))
}
typeck::method_param(mp) {
typeck::method_param({iface_id:mp.iface_id.tr(xcx) with mp})
typeck::method_param({trait_id:mp.trait_id.tr(xcx) with mp})
}
typeck::method_iface(did, m) {
typeck::method_iface(did.tr(xcx), m)
typeck::method_trait(did, m) {
typeck::method_trait(did.tr(xcx), m)
}
}
}
@ -458,8 +458,8 @@ fn encode_vtable_origin(ecx: @e::encode_ctxt,
}
}
}
typeck::vtable_iface(def_id, tys) {
do ebml_w.emit_enum_variant("vtable_iface", 1u, 3u) {
typeck::vtable_trait(def_id, tys) {
do ebml_w.emit_enum_variant("vtable_trait", 1u, 3u) {
do ebml_w.emit_enum_variant_arg(0u) {
ebml_w.emit_def_id(def_id)
}
@ -507,7 +507,7 @@ impl helpers for ebml::ebml_deserializer {
)
}
2u {
typeck::vtable_iface(
typeck::vtable_trait(
do self.read_enum_variant_arg(0u) {
self.read_def_id(xcx)
},