From fc81adb3c221c4d5687685742f6235c37128e8e0 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Tue, 31 Jul 2018 22:40:55 +0200 Subject: [PATCH] Improve functions naming --- src/librustdoc/clean/auto_trait.rs | 6 +++--- src/librustdoc/clean/blanket_impl.rs | 6 +++--- src/librustdoc/clean/def_ctor.rs | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/librustdoc/clean/auto_trait.rs b/src/librustdoc/clean/auto_trait.rs index 67f3d6217b6..289b174b6f4 100644 --- a/src/librustdoc/clean/auto_trait.rs +++ b/src/librustdoc/clean/auto_trait.rs @@ -16,7 +16,7 @@ use rustc::middle::cstore::CrateStore; use std::fmt::Debug; -use self::def_ctor::{get_def_ctor_from_def_id, get_def_ctor_from_node_id}; +use self::def_ctor::{get_def_from_def_id, get_def_from_node_id}; use self::finder_trait::Finder; use super::*; @@ -34,13 +34,13 @@ pub fn new(cx: &'a core::DocContext<'a, 'tcx, 'rcx, 'cstore>) -> Self { } pub fn get_with_def_id(&self, def_id: DefId) -> Vec { - get_def_ctor_from_def_id(&self.cx, def_id, &|def_ctor| { + get_def_from_def_id(&self.cx, def_id, &|def_ctor| { self.get_auto_trait_impls(def_id, &def_ctor, None) }) } pub fn get_with_node_id(&self, id: ast::NodeId, name: String) -> Vec { - get_def_ctor_from_node_id(&self.cx, id, name, &|def_ctor, name| { + get_def_from_node_id(&self.cx, id, name, &|def_ctor, name| { let did = self.cx.tcx.hir.local_def_id(id); self.get_auto_trait_impls(did, &def_ctor, Some(name)) }) diff --git a/src/librustdoc/clean/blanket_impl.rs b/src/librustdoc/clean/blanket_impl.rs index ade65ec99b1..05e57337c70 100644 --- a/src/librustdoc/clean/blanket_impl.rs +++ b/src/librustdoc/clean/blanket_impl.rs @@ -19,7 +19,7 @@ use super::*; -use self::def_ctor::{get_def_ctor_from_def_id, get_def_ctor_from_node_id}; +use self::def_ctor::{get_def_from_def_id, get_def_from_node_id}; use self::finder_trait::Finder; pub struct BlanketImplFinder<'a, 'tcx: 'a, 'rcx: 'a> { @@ -32,13 +32,13 @@ pub fn new(cx: &'a core::DocContext<'a, 'tcx, 'rcx>) -> Self { } pub fn get_with_def_id(&self, def_id: DefId) -> Vec { - get_def_ctor_from_def_id(&self.cx, def_id, &|def_ctor| { + get_def_from_def_id(&self.cx, def_id, &|def_ctor| { self.get_blanket_impls(def_id, &def_ctor, None) }) } pub fn get_with_node_id(&self, id: ast::NodeId, name: String) -> Vec { - get_def_ctor_from_node_id(&self.cx, id, name, &|def_ctor, name| { + get_def_from_node_id(&self.cx, id, name, &|def_ctor, name| { let did = self.cx.tcx.hir.local_def_id(id); self.get_blanket_impls(did, &def_ctor, Some(name)) }) diff --git a/src/librustdoc/clean/def_ctor.rs b/src/librustdoc/clean/def_ctor.rs index b20a0c506b8..4db211b7f1e 100644 --- a/src/librustdoc/clean/def_ctor.rs +++ b/src/librustdoc/clean/def_ctor.rs @@ -12,9 +12,9 @@ use super::*; -pub fn get_def_ctor_from_def_id(cx: &DocContext, - def_id: DefId, - callback: &F, +pub fn get_def_from_def_id(cx: &DocContext, + def_id: DefId, + callback: &F, ) -> Vec where F: Fn(& dyn Fn(DefId) -> Def) -> Vec { let ty = cx.tcx.type_of(def_id); @@ -48,10 +48,10 @@ pub fn get_def_ctor_from_def_id(cx: &DocContext, } } -pub fn get_def_ctor_from_node_id(cx: &DocContext, - id: ast::NodeId, - name: String, - callback: &F, +pub fn get_def_from_node_id(cx: &DocContext, + id: ast::NodeId, + name: String, + callback: &F, ) -> Vec where F: Fn(& dyn Fn(DefId) -> Def, String) -> Vec { let item = &cx.tcx.hir.expect_item(id).node; -- 2.44.0