about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-08-27 23:25:38 +0000
committerbors <bors@rust-lang.org>2015-08-27 23:25:38 +0000
commit8dba06aeee28e9ed6a1b9918a91cbef242af53d3 (patch)
tree3eafdb047257f17e55f56408801e9df45cbbf5f4 /src/libstd
parent79dd92fc1638463ab8af1d275686c4751ce91465 (diff)
parenta63cd9b5a165ca86529e678b9fea642bdae2e156 (diff)
downloadrust-8dba06aeee28e9ed6a1b9918a91cbef242af53d3.tar.gz
rust-8dba06aeee28e9ed6a1b9918a91cbef242af53d3.zip
Auto merge of #28052 - Manishearth:rollup, r=Manishearth
- Successful merges: #28010, #28013, #28022, #28029, #28033, #28039, #28045, #28048
- Failed merges: 
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/path.rs7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/libstd/path.rs b/src/libstd/path.rs
index b5e08752344..66893ffd330 100644
--- a/src/libstd/path.rs
+++ b/src/libstd/path.rs
@@ -598,8 +598,11 @@ impl<'a> Components<'a> {
     /// how much of the prefix is left from the point of view of iteration?
     #[inline]
     fn prefix_remaining(&self) -> usize {
-        if self.front == State::Prefix { self.prefix_len() }
-        else { 0 }
+        if self.front == State::Prefix {
+            self.prefix_len()
+        } else {
+            0
+        }
     }
 
     // Given the iteration so far, how much of the pre-State::Body path is left?