From 2ad20df40b94e38cc576b3d24977c1108ca3fe82 Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Sun, 1 Apr 2012 15:43:48 -0700 Subject: [PATCH] std: Rename result::methods to result::extensions --- src/libcore/result.rs | 2 +- src/rustc/middle/infer.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libcore/result.rs b/src/libcore/result.rs index 3957bd31a10..cb34213d974 100644 --- a/src/libcore/result.rs +++ b/src/libcore/result.rs @@ -108,7 +108,7 @@ fn chain_err( } } -impl methods for result { +impl extensions for result { fn chain(op: fn(T) -> result) -> result { chain(self, op) } diff --git a/src/rustc/middle/infer.rs b/src/rustc/middle/infer.rs index ec7af5ff365..157141235b3 100644 --- a/src/rustc/middle/infer.rs +++ b/src/rustc/middle/infer.rs @@ -5,7 +5,7 @@ import middle::ty; import syntax::ast; import syntax::ast::{ret_style}; import util::ppaux::{ty_to_str, mt_to_str}; -import result::{result, methods, chain, chain_err, ok, err, map, map2, iter2}; +import result::{result, extensions, ok, err, map, map2, iter2}; import ty::type_is_bot; export infer_ctxt; @@ -85,7 +85,7 @@ fn fixup_vars(cx: infer_ctxt, a: ty::t) -> fres { impl methods for ures { fn then(f: fn() -> result) -> result { - chain(self) {|_i| f() } + self.chain() {|_i| f() } } }