Skip to content

Commit cf0654c

Browse files
committed
Improve naming of tuple getters, and add mutable tuple getter
Renames the `n*` and `n*_ref` tuple getters to `val*` and `ref*` respectively, and adds `mut*` getters.
1 parent 2cd7a29 commit cf0654c

File tree

5 files changed

+136
-133
lines changed

5 files changed

+136
-133
lines changed

src/libcollections/btree.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -500,15 +500,15 @@ impl<K: Clone + TotalOrd, V: Clone> Branch<K, V> {
500500
let new_outcome = self.clone().rightmost_child.insert(k.clone(),
501501
v.clone(),
502502
ub.clone());
503-
new_branch = new_outcome.clone().n0();
504-
outcome = new_outcome.n1();
503+
new_branch = new_outcome.clone().val0();
504+
outcome = new_outcome.val1();
505505
}
506506
else {
507507
let new_outcome = self.clone().elts[index.unwrap()].left.insert(k.clone(),
508508
v.clone(),
509509
ub.clone());
510-
new_branch = new_outcome.clone().n0();
511-
outcome = new_outcome.n1();
510+
new_branch = new_outcome.clone().val0();
511+
outcome = new_outcome.val1();
512512
}
513513
//Check to see whether a branch or a leaf was returned from the
514514
//tree traversal.

src/librustdoc/html/render.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1379,11 +1379,11 @@ fn render_methods(w: &mut Writer, it: &clean::Item) -> fmt::Result {
13791379
match c.impls.find(&it.id) {
13801380
Some(v) => {
13811381
let mut non_trait = v.iter().filter(|p| {
1382-
p.n0_ref().trait_.is_none()
1382+
p.ref0().trait_.is_none()
13831383
});
13841384
let non_trait = non_trait.to_owned_vec();
13851385
let mut traits = v.iter().filter(|p| {
1386-
p.n0_ref().trait_.is_some()
1386+
p.ref0().trait_.is_some()
13871387
});
13881388
let traits = traits.to_owned_vec();
13891389

src/librustdoc/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ fn rust_input(cratefile: &str, matches: &getopts::Matches) -> Output {
262262
let mut pm = plugins::PluginManager::new(Path::new(path));
263263
for pass in passes.iter() {
264264
let plugin = match PASSES.iter().position(|&(p, _, _)| p == *pass) {
265-
Some(i) => PASSES[i].n1(),
265+
Some(i) => PASSES[i].val1(),
266266
None => {
267267
error!("unknown pass {}, skipping", *pass);
268268
continue

0 commit comments

Comments
 (0)