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/libstd/hash/mod.rs | 2 +- src/libstd/io/net/udp.rs | 4 ++-- src/libstd/rand/distributions/mod.rs | 12 ++++++------ src/libstd/rand/mod.rs | 8 ++++---- src/libstd/str.rs | 18 +++++++++--------- 5 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src/libstd') diff --git a/src/libstd/hash/mod.rs b/src/libstd/hash/mod.rs index 0d319c5d74e..6c0ae280ed0 100644 --- a/src/libstd/hash/mod.rs +++ b/src/libstd/hash/mod.rs @@ -181,7 +181,7 @@ macro_rules! impl_hash_tuple( ); ) -impl_hash_tuple!(A0 A1 A2 A3 A4 A5 A6 A7) +impl_hash_tuple!(a0 a1 a2 a3 a4 a5 a6 a7) impl<'a, S: Writer, T: Hash> Hash for &'a [T] { #[inline] diff --git a/src/libstd/io/net/udp.rs b/src/libstd/io/net/udp.rs index 1aff58a80ec..79771569d83 100644 --- a/src/libstd/io/net/udp.rs +++ b/src/libstd/io/net/udp.rs @@ -85,8 +85,8 @@ impl Reader for UdpStream { impl Writer for UdpStream { fn write(&mut self, buf: &[u8]) -> IoResult<()> { - let connectedTo = self.connectedTo; - self.as_socket(|sock| sock.sendto(buf, connectedTo)) + let connected_to = self.connectedTo; + self.as_socket(|sock| sock.sendto(buf, connected_to)) } } diff --git a/src/libstd/rand/distributions/mod.rs b/src/libstd/rand/distributions/mod.rs index 7372d171de7..41a106ec887 100644 --- a/src/libstd/rand/distributions/mod.rs +++ b/src/libstd/rand/distributions/mod.rs @@ -213,8 +213,8 @@ mod ziggurat_tables; fn ziggurat( rng: &mut R, symmetric: bool, - X: ziggurat_tables::ZigTable, - F: ziggurat_tables::ZigTable, + x_tab: ziggurat_tables::ZigTable, + f_tab: ziggurat_tables::ZigTable, pdf: 'static |f64| -> f64, zero_case: 'static |&mut R, f64| -> f64) -> f64 { @@ -233,19 +233,19 @@ fn ziggurat( // u is either U(-1, 1) or U(0, 1) depending on if this is a // symmetric distribution or not. let u = if symmetric {2.0 * f - 1.0} else {f}; - let x = u * X[i]; + let x = u * x_tab[i]; let test_x = if symmetric {num::abs(x)} else {x}; - // algebraically equivalent to |u| < X[i+1]/X[i] (or u < X[i+1]/X[i]) - if test_x < X[i + 1] { + // algebraically equivalent to |u| < x_tab[i+1]/x_tab[i] (or u < x_tab[i+1]/x_tab[i]) + if test_x < x_tab[i + 1] { return x; } if i == 0 { return zero_case(rng, u); } // algebraically equivalent to f1 + DRanU()*(f0 - f1) < 1 - if F[i + 1] + (F[i] - F[i + 1]) * rng.gen() < pdf(x) { + if f_tab[i + 1] + (f_tab[i] - f_tab[i + 1]) * rng.gen() < pdf(x) { return x; } } diff --git a/src/libstd/rand/mod.rs b/src/libstd/rand/mod.rs index 7218f83d662..20bce8d2058 100644 --- a/src/libstd/rand/mod.rs +++ b/src/libstd/rand/mod.rs @@ -803,11 +803,11 @@ mod test { #[test] fn test_sample() { - let MIN_VAL = 1; - let MAX_VAL = 100; + let min_val = 1; + let max_val = 100; let mut r = rng(); - let vals = range(MIN_VAL, MAX_VAL).to_owned_vec(); + let vals = range(min_val, max_val).to_owned_vec(); let small_sample = r.sample(vals.iter(), 5); let large_sample = r.sample(vals.iter(), vals.len() + 5); @@ -815,7 +815,7 @@ mod test { assert_eq!(large_sample.len(), vals.len()); assert!(small_sample.iter().all(|e| { - **e >= MIN_VAL && **e <= MAX_VAL + **e >= min_val && **e <= max_val })); } diff --git a/src/libstd/str.rs b/src/libstd/str.rs index 5131c684795..ef9be6ee70c 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -575,9 +575,9 @@ fn canonical_sort(comb: &mut [(char, u8)]) { for i in range(0, len) { let mut swapped = false; for j in range(1, len-i) { - let classA = *comb[j-1].ref1(); - let classB = *comb[j].ref1(); - if classA != 0 && classB != 0 && classA > classB { + let class_a = *comb[j-1].ref1(); + let class_b = *comb[j].ref1(); + if class_a != 0 && class_b != 0 && class_a > class_b { comb.swap(j-1, j); swapped = true; } @@ -3427,8 +3427,8 @@ mod tests { let repl = ~"دولة الكويت"; let a = ~"ประเ"; - let A = ~"دولة الكويتทศไทย中华"; - assert_eq!(data.replace(a, repl), A); + let a2 = ~"دولة الكويتทศไทย中华"; + assert_eq!(data.replace(a, repl), a2); } #[test] @@ -3437,8 +3437,8 @@ mod tests { let repl = ~"دولة الكويت"; let b = ~"ะเ"; - let B = ~"ปรدولة الكويتทศไทย中华"; - assert_eq!(data.replace(b, repl), B); + let b2 = ~"ปรدولة الكويتทศไทย中华"; + assert_eq!(data.replace(b, repl), b2); } #[test] @@ -3447,8 +3447,8 @@ mod tests { let repl = ~"دولة الكويت"; let c = ~"中华"; - let C = ~"ประเทศไทยدولة الكويت"; - assert_eq!(data.replace(c, repl), C); + let c2 = ~"ประเทศไทยدولة الكويت"; + assert_eq!(data.replace(c, repl), c2); } #[test] -- cgit 1.4.1-3-g733a5