Skip to content

Commit

Permalink
Finish de-implicit-selfing everything but the test suite
Browse files Browse the repository at this point in the history
  • Loading branch information
bstrie committed Mar 9, 2013
1 parent ddecef7 commit fdf69dd
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 22 deletions.
1 change: 1 addition & 0 deletions src/libcore/core.rc
Expand Up @@ -51,6 +51,7 @@ Implicitly, all crates behave as if they included the following prologue:
#[warn(vecs_implicitly_copyable)];
#[deny(non_camel_case_types)];
#[allow(deprecated_mutable_fields)];
#[deny(deprecated_self)];

// On Linux, link to the runtime with -lrt.
#[cfg(target_os = "linux")]
Expand Down
1 change: 1 addition & 0 deletions src/libfuzzer/fuzzer.rc
Expand Up @@ -25,6 +25,7 @@
#[allow(non_camel_case_types)];
#[allow(deprecated_mode)];
#[allow(deprecated_pattern)];
#[deny(deprecated_self)];

extern mod core(vers = "0.6");
extern mod std(vers = "0.6");
Expand Down
2 changes: 2 additions & 0 deletions src/librust/rust.rc
Expand Up @@ -12,6 +12,8 @@
// XXX: Make commands run and test emit proper file endings on winds
// XXX: Make run only accept source that emits an executable

#[deny(deprecated_self)];

#[link(name = "rust",
vers = "0.6",
uuid = "4a24da33-5cc8-4037-9352-2cbe9bd9d27c",
Expand Down
6 changes: 3 additions & 3 deletions src/librustc/middle/astencode.rs
Expand Up @@ -721,12 +721,12 @@ impl vtable_decoder_helpers for reader::Decoder {
// Encoding and decoding the side tables

trait get_ty_str_ctxt {
fn ty_str_ctxt() -> @tyencode::ctxt;
fn ty_str_ctxt(@self) -> @tyencode::ctxt;
}

impl get_ty_str_ctxt for @e::EncodeContext {
impl get_ty_str_ctxt for e::EncodeContext {
// IMPLICIT SELF WARNING: fix this!
fn ty_str_ctxt() -> @tyencode::ctxt {
fn ty_str_ctxt(@self) -> @tyencode::ctxt {
@tyencode::ctxt {diag: self.tcx.sess.diagnostic(),
ds: e::def_to_str,
tcx: self.tcx,
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/middle/liveness.rs
Expand Up @@ -816,7 +816,7 @@ pub impl Liveness {
}
}

fn indices2(ln: LiveNode, succ_ln: LiveNode,
fn indices2(&self, ln: LiveNode, succ_ln: LiveNode,
op: fn(uint, uint)) {
let node_base_idx = self.idx(ln, Variable(0u));
let succ_base_idx = self.idx(succ_ln, Variable(0u));
Expand Down
12 changes: 6 additions & 6 deletions src/librustc/middle/resolve.rs
Expand Up @@ -592,7 +592,7 @@ pub impl NameBindings {
}

/// Returns the module node if applicable.
fn get_module_if_available() -> Option<@mut Module> {
fn get_module_if_available(&self) -> Option<@mut Module> {
match self.type_def {
Some(ref type_def) => (*type_def).module_def,
None => None
Expand All @@ -613,14 +613,14 @@ pub impl NameBindings {
}
}

fn defined_in_namespace(namespace: Namespace) -> bool {
fn defined_in_namespace(&self, namespace: Namespace) -> bool {
match namespace {
TypeNS => return self.type_def.is_some(),
ValueNS => return self.value_def.is_some()
}
}

fn defined_in_public_namespace(namespace: Namespace) -> bool {
fn defined_in_public_namespace(&self, namespace: Namespace) -> bool {
match namespace {
TypeNS => match self.type_def {
Some(def) => def.privacy != Private,
Expand All @@ -633,7 +633,7 @@ pub impl NameBindings {
}
}

fn def_for_namespace(namespace: Namespace) -> Option<def> {
fn def_for_namespace(&self, namespace: Namespace) -> Option<def> {
match namespace {
TypeNS => {
match self.type_def {
Expand Down Expand Up @@ -666,7 +666,7 @@ pub impl NameBindings {
}
}

fn privacy_for_namespace(namespace: Namespace) -> Option<Privacy> {
fn privacy_for_namespace(&self, namespace: Namespace) -> Option<Privacy> {
match namespace {
TypeNS => {
match self.type_def {
Expand All @@ -683,7 +683,7 @@ pub impl NameBindings {
}
}

fn span_for_namespace(namespace: Namespace) -> Option<span> {
fn span_for_namespace(&self, namespace: Namespace) -> Option<span> {
if self.defined_in_namespace(namespace) {
match namespace {
TypeNS => self.type_span,
Expand Down
5 changes: 3 additions & 2 deletions src/librustc/middle/typeck/check/method.rs
Expand Up @@ -235,7 +235,8 @@ pub impl LookupContext/&self {
self.search_for_autosliced_method(self_ty, autoderefs)
}

fn deref(ty: ty::t, enum_dids: &mut ~[ast::def_id]) -> Option<ty::t> {
fn deref(&self, ty: ty::t, enum_dids: &mut ~[ast::def_id])
-> Option<ty::t> {
match ty::get(ty).sty {
ty_enum(did, _) => {
// Watch out for newtype'd enums like "enum t = @T".
Expand Down Expand Up @@ -599,7 +600,7 @@ pub impl LookupContext/&self {
}
}

fn push_inherent_impl_candidates_for_type(did: def_id) {
fn push_inherent_impl_candidates_for_type(&self, did: def_id) {
let opt_impl_infos =
self.fcx.ccx.coherence_info.inherent_methods.find(&did);
for opt_impl_infos.each |impl_infos| {
Expand Down
10 changes: 4 additions & 6 deletions src/librustc/middle/typeck/coherence.rs
Expand Up @@ -191,15 +191,14 @@ pub struct CoherenceChecker {
}

pub impl CoherenceChecker {
// IMPLICIT SELF WARNING: fix this!
fn check_coherence(crate: @crate) {
fn check_coherence(self, crate: @crate) {
// Check implementations and traits. This populates the tables
// containing the inherent methods and extension methods. It also
// builds up the trait inheritance table.
visit_crate(*crate, (), mk_simple_visitor(@SimpleVisitor {
visit_item: |item| {
debug!("(checking coherence) item '%s'",
*self.crate_context.tcx.sess.str_of(item.ident));
// debug!("(checking coherence) item '%s'",
// self.crate_context.tcx.sess.str_of(item.ident));

match item.node {
item_impl(_, opt_trait, _, _) => {
Expand Down Expand Up @@ -617,8 +616,7 @@ pub impl CoherenceChecker {
}

// Privileged scope checking
// IMPLICIT SELF WARNING: fix this!
fn check_privileged_scopes(crate: @crate) {
fn check_privileged_scopes(self, crate: @crate) {
visit_crate(*crate, (), mk_vt(@Visitor {
visit_item: |item, _context, visitor| {
match /*bad*/copy item.node {
Expand Down
6 changes: 3 additions & 3 deletions src/librustc/middle/typeck/infer/mod.rs
Expand Up @@ -584,7 +584,7 @@ pub impl @mut InferCtxt {
}

/// Execute `f` and commit the bindings if successful
fn commit<T,E>(f: fn() -> Result<T,E>) -> Result<T,E> {
fn commit<T,E>(&self, f: fn() -> Result<T,E>) -> Result<T,E> {
fail_unless!(!self.in_snapshot());

debug!("commit()");
Expand All @@ -599,7 +599,7 @@ pub impl @mut InferCtxt {
}

/// Execute `f`, unroll bindings on failure
fn try<T,E>(f: fn() -> Result<T,E>) -> Result<T,E> {
fn try<T,E>(&self, f: fn() -> Result<T,E>) -> Result<T,E> {
debug!("try()");
do indent {
let snapshot = self.start_snapshot();
Expand All @@ -613,7 +613,7 @@ pub impl @mut InferCtxt {
}

/// Execute `f` then unroll any bindings it creates
fn probe<T,E>(f: fn() -> Result<T,E>) -> Result<T,E> {
fn probe<T,E>(&self, f: fn() -> Result<T,E>) -> Result<T,E> {
debug!("probe()");
do indent {
let snapshot = self.start_snapshot();
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/rustc.rc
Expand Up @@ -24,7 +24,7 @@
#[allow(non_camel_case_types)];
#[allow(deprecated_mode)];
#[warn(deprecated_pattern)];
#[allow(deprecated_self)];
#[deny(deprecated_self)];

#[no_core];

Expand Down
1 change: 1 addition & 0 deletions src/librustdoc/rustdoc.rc
Expand Up @@ -22,6 +22,7 @@
#[no_core];

#[allow(non_implicitly_copyable_typarams)];
#[deny(deprecated_self)];

extern mod core(vers = "0.6");
extern mod std(vers = "0.6");
Expand Down
1 change: 1 addition & 0 deletions src/librusti/rusti.rc
Expand Up @@ -22,6 +22,7 @@

#[allow(vecs_implicitly_copyable,
non_implicitly_copyable_typarams)];
#[deny(deprecated_self)];

extern mod core(vers = "0.6");
extern mod std(vers = "0.6");
Expand Down
1 change: 1 addition & 0 deletions src/librustpkg/rustpkg.rc
Expand Up @@ -20,6 +20,7 @@
#[no_core];
#[allow(vecs_implicitly_copyable,
non_implicitly_copyable_typarams)];
#[deny(deprecated_self)];

extern mod core(vers = "0.6");
extern mod std(vers = "0.6");
Expand Down

5 comments on commit fdf69dd

@bors
Copy link
Contributor

@bors bors commented on fdf69dd Mar 9, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from pcwalton
at bstrie@fdf69dd

@bors
Copy link
Contributor

@bors bors commented on fdf69dd Mar 9, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging bstrie/rust/dis = fdf69dd into auto

@bors
Copy link
Contributor

@bors bors commented on fdf69dd Mar 9, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bstrie/rust/dis = fdf69dd merged ok, testing candidate = a5fae1d

@bors
Copy link
Contributor

@bors bors commented on fdf69dd Mar 9, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on fdf69dd Mar 9, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding incoming to auto = a5fae1d

Please sign in to comment.