about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-01-14 22:23:59 +0000
committerbors <bors@rust-lang.org>2016-01-14 22:23:59 +0000
commit2fb0c5ebcf6d912224532265776fb96febea9797 (patch)
tree60309b6ce82ca33f616667fd10c13910755f8319 /src/libstd
parentc12c42de0ac3f4ab50f2c138e53e6e94f8da11ec (diff)
parent6ab39ff098fb7b3c04372380c059e144e5d88993 (diff)
downloadrust-2fb0c5ebcf6d912224532265776fb96febea9797.tar.gz
rust-2fb0c5ebcf6d912224532265776fb96febea9797.zip
Auto merge of #30916 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #30712, #30895, #30902, #30903, #30909, #30910, #30911, #30912, #30914
- Failed merges:
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/num/f32.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/num/f32.rs b/src/libstd/num/f32.rs
index 259f0d390b4..7f57d6dc650 100644
--- a/src/libstd/num/f32.rs
+++ b/src/libstd/num/f32.rs
@@ -62,7 +62,7 @@ mod cmath {
         pub fn hypotf(x: c_float, y: c_float) -> c_float;
     }
 
-    // See the comments in `core::float::Float::floor` for why MSVC is special
+    // See the comments in the `floor` function for why MSVC is special
     // here.
     #[cfg(not(target_env = "msvc"))]
     extern {