Skip to content

Commit fc81adb

Browse files
Improve functions naming
1 parent 2758de4 commit fc81adb

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

src/librustdoc/clean/auto_trait.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use rustc::infer::InferOk;
1616
use rustc::middle::cstore::CrateStore;
1717
use std::fmt::Debug;
1818

19-
use self::def_ctor::{get_def_ctor_from_def_id, get_def_ctor_from_node_id};
19+
use self::def_ctor::{get_def_from_def_id, get_def_from_node_id};
2020
use self::finder_trait::Finder;
2121

2222
use super::*;
@@ -34,13 +34,13 @@ impl<'a, 'tcx, 'rcx, 'cstore> AutoTraitFinder<'a, 'tcx, 'rcx, 'cstore> {
3434
}
3535

3636
pub fn get_with_def_id(&self, def_id: DefId) -> Vec<Item> {
37-
get_def_ctor_from_def_id(&self.cx, def_id, &|def_ctor| {
37+
get_def_from_def_id(&self.cx, def_id, &|def_ctor| {
3838
self.get_auto_trait_impls(def_id, &def_ctor, None)
3939
})
4040
}
4141

4242
pub fn get_with_node_id(&self, id: ast::NodeId, name: String) -> Vec<Item> {
43-
get_def_ctor_from_node_id(&self.cx, id, name, &|def_ctor, name| {
43+
get_def_from_node_id(&self.cx, id, name, &|def_ctor, name| {
4444
let did = self.cx.tcx.hir.local_def_id(id);
4545
self.get_auto_trait_impls(did, &def_ctor, Some(name))
4646
})

src/librustdoc/clean/blanket_impl.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use core::DocAccessLevels;
1919

2020
use super::*;
2121

22-
use self::def_ctor::{get_def_ctor_from_def_id, get_def_ctor_from_node_id};
22+
use self::def_ctor::{get_def_from_def_id, get_def_from_node_id};
2323
use self::finder_trait::Finder;
2424

2525
pub struct BlanketImplFinder<'a, 'tcx: 'a, 'rcx: 'a> {
@@ -32,13 +32,13 @@ impl<'a, 'tcx, 'rcx> BlanketImplFinder <'a, 'tcx, 'rcx> {
3232
}
3333

3434
pub fn get_with_def_id(&self, def_id: DefId) -> Vec<Item> {
35-
get_def_ctor_from_def_id(&self.cx, def_id, &|def_ctor| {
35+
get_def_from_def_id(&self.cx, def_id, &|def_ctor| {
3636
self.get_blanket_impls(def_id, &def_ctor, None)
3737
})
3838
}
3939

4040
pub fn get_with_node_id(&self, id: ast::NodeId, name: String) -> Vec<Item> {
41-
get_def_ctor_from_node_id(&self.cx, id, name, &|def_ctor, name| {
41+
get_def_from_node_id(&self.cx, id, name, &|def_ctor, name| {
4242
let did = self.cx.tcx.hir.local_def_id(id);
4343
self.get_blanket_impls(did, &def_ctor, Some(name))
4444
})

src/librustdoc/clean/def_ctor.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ use core::DocContext;
1212

1313
use super::*;
1414

15-
pub fn get_def_ctor_from_def_id<F>(cx: &DocContext,
16-
def_id: DefId,
17-
callback: &F,
15+
pub fn get_def_from_def_id<F>(cx: &DocContext,
16+
def_id: DefId,
17+
callback: &F,
1818
) -> Vec<Item>
1919
where F: Fn(& dyn Fn(DefId) -> Def) -> Vec<Item> {
2020
let ty = cx.tcx.type_of(def_id);
@@ -48,10 +48,10 @@ where F: Fn(& dyn Fn(DefId) -> Def) -> Vec<Item> {
4848
}
4949
}
5050

51-
pub fn get_def_ctor_from_node_id<F>(cx: &DocContext,
52-
id: ast::NodeId,
53-
name: String,
54-
callback: &F,
51+
pub fn get_def_from_node_id<F>(cx: &DocContext,
52+
id: ast::NodeId,
53+
name: String,
54+
callback: &F,
5555
) -> Vec<Item>
5656
where F: Fn(& dyn Fn(DefId) -> Def, String) -> Vec<Item> {
5757
let item = &cx.tcx.hir.expect_item(id).node;

0 commit comments

Comments
 (0)