Fix for #23150

2 files changed, 18 insertions, 1 deletions

diff --git a/src/libcore/fmt/float.rs b/src/libcore/fmt/float.rs
index 6a5943265ca..5f19bc5be98 100644
--- a/src/libcore/fmt/float.rs
+++ b/src/libcore/fmt/float.rs
@@ -242,7 +242,7 @@ pub fn float_to_str_bytes_common<T: Float, U, F>(
                     if i < 0
                     || buf[i as usize] == b'-'
                     || buf[i as usize] == b'+' {
-                        for j in (i as usize + 1..end).rev() {
+                        for j in ((i + 1) as usize..end).rev() {
                             buf[j + 1] = buf[j];
                         }
                         buf[(i + 1) as usize] = value2ascii(1);
diff --git a/src/libcoretest/fmt/float.rs b/src/libcoretest/fmt/float.rs
new file mode 100644
index 00000000000..6b14fa8be8e
--- /dev/null
+++ b/src/libcoretest/fmt/float.rs
@@ -0,0 +1,17 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[test]
+fn test_format_float() {
+    assert!("1" == format!("{:.0}", 1.0f64));
+    assert!("9" == format!("{:.0}", 9.4f64));
+    assert!("10" == format!("{:.0}", 9.9f64));
+    assert!("9.9" == format!("{:.1}", 9.85f64));
+}