From 6d9bdf975aba3cd2f571f4e3695136f2ee85f37f Mon Sep 17 00:00:00 2001
From: Palmer Cox
Date: Sat, 15 Feb 2014 16:15:03 -0500
Subject: Rename all variables that have uppercase characters in their names to
use only lowercase characters
---
src/libsyntax/diagnostic.rs | 4 ++--
src/libsyntax/print/pp.rs | 28 ++++++++++++++--------------
2 files changed, 16 insertions(+), 16 deletions(-)
(limited to 'src/libsyntax')
diff --git a/src/libsyntax/diagnostic.rs b/src/libsyntax/diagnostic.rs
index c0c64d6fd60..0cf13cfaba5 100644
--- a/src/libsyntax/diagnostic.rs
+++ b/src/libsyntax/diagnostic.rs
@@ -339,12 +339,12 @@ fn highlight_lines(err: &mut EmitterWriter,
for _ in range(0, skip) { s.push_char(' '); }
let orig = fm.get_line(*lines.lines.get(0) as int);
for pos in range(0u, left-skip) {
- let curChar = orig[pos] as char;
+ let cur_char = orig[pos] as char;
// Whenever a tab occurs on the previous line, we insert one on
// the error-point-squiggly-line as well (instead of a space).
// That way the squiggly line will usually appear in the correct
// position.
- match curChar {
+ match cur_char {
'\t' => s.push_char('\t'),
_ => s.push_char(' '),
};
diff --git a/src/libsyntax/print/pp.rs b/src/libsyntax/print/pp.rs
index b3e7ac667d8..5540b26d9e7 100644
--- a/src/libsyntax/print/pp.rs
+++ b/src/libsyntax/print/pp.rs
@@ -124,10 +124,10 @@ pub fn buf_str(toks: Vec , szs: Vec , left: uint, right: uint,
let n = toks.len();
assert_eq!(n, szs.len());
let mut i = left;
- let mut L = lim;
+ let mut l = lim;
let mut s = ~"[";
- while i != right && L != 0u {
- L -= 1u;
+ while i != right && l != 0u {
+ l -= 1u;
if i != left {
s.push_str(", ");
}
@@ -427,15 +427,15 @@ impl Printer {
self.right %= self.buf_len;
assert!((self.right != self.left));
}
- pub fn advance_left(&mut self, x: Token, L: int) -> io::IoResult<()> {
+ pub fn advance_left(&mut self, x: Token, l: int) -> io::IoResult<()> {
debug!("advnce_left ~[{},{}], sizeof({})={}", self.left, self.right,
- self.left, L);
- if L >= 0 {
- let ret = self.print(x.clone(), L);
+ self.left, l);
+ if l >= 0 {
+ let ret = self.print(x.clone(), l);
match x {
Break(b) => self.left_total += b.blank_space,
String(_, len) => {
- assert_eq!(len, L); self.left_total += len;
+ assert_eq!(len, l); self.left_total += len;
}
_ => ()
}
@@ -510,8 +510,8 @@ impl Printer {
}
write!(self.out, "{}", s)
}
- pub fn print(&mut self, x: Token, L: int) -> io::IoResult<()> {
- debug!("print {} {} (remaining line space={})", tok_str(x.clone()), L,
+ pub fn print(&mut self, x: Token, l: int) -> io::IoResult<()> {
+ debug!("print {} {} (remaining line space={})", tok_str(x.clone()), l,
self.space);
debug!("{}", buf_str(self.token.clone(),
self.size.clone(),
@@ -520,7 +520,7 @@ impl Printer {
6));
match x {
Begin(b) => {
- if L > self.space {
+ if l > self.space {
let col = self.margin - self.space + b.offset;
debug!("print Begin -> push broken block at col {}", col);
self.print_stack.push(PrintStackElem {
@@ -560,7 +560,7 @@ impl Printer {
ret
}
Broken(Inconsistent) => {
- if L > self.space {
+ if l > self.space {
debug!("print Break({}+{}) w/ newline in inconsistent",
top.offset, b.offset);
let ret = self.print_newline(top.offset + b.offset);
@@ -578,8 +578,8 @@ impl Printer {
}
String(s, len) => {
debug!("print String({})", s);
- assert_eq!(L, len);
- // assert!(L <= space);
+ assert_eq!(l, len);
+ // assert!(l <= space);
self.space -= len;
self.print_str(s)
}
--
cgit 1.4.1-3-g733a5