---

yaml
---
r: 271659
b: refs/heads/master
c: 157ba00
h: refs/heads/master
i:
  271657: ce014f9
  271655: 7239514

Author: Manishearth

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a18e12494f2c6e219a7107b3a827c55dc360aa8b
+refs/heads/master: 157ba0038dea24f06d594b6e1190fcd0eb431018
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
 refs/heads/try: 49312a405e14a449b98fe0056b12a40ac128be4a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/src/librustc/ty/mod.rs

@@ -1202,6 +1202,7 @@ impl<'a, 'tcx> ParameterEnvironment<'a, 'tcx> {
         }
     }
 
+    /// Construct a parameter environment given an item, impl item, or trait item
     pub fn for_item(cx: &'a TyCtxt<'tcx>, id: NodeId) -> ParameterEnvironment<'a, 'tcx> {
         match cx.map.find(id) {
             Some(ast_map::NodeImplItem(ref impl_item)) => {

trunk/src/libstd/sys/windows/net.rs

@@ -61,28 +61,27 @@ fn last_error() -> io::Error {
 }
 
 /// Checks if the signed integer is the Windows constant `SOCKET_ERROR` (-1)
-/// and if so, returns the last error from the Windows socket interface. This
+/// and if so, returns the last error from the Windows socket interface. . This
 /// function must be called before another call to the socket API is made.
-pub fn cvt<T: One + PartialEq + Neg<Output=T>>(t: T) -> io::Result<T> {
-    if t == -T::one() {
+pub fn cvt<T: One + Neg<Output=T> + PartialEq>(t: T) -> io::Result<T> {
+    let one: T = T::one();
+    if t == -one {
         Err(last_error())
     } else {
         Ok(t)
     }
 }
 
-/// A variant of `cvt` for `getaddrinfo` which return 0 for a success.
+/// Provides the functionality of `cvt` for the return values of `getaddrinfo`
+/// and similar, meaning that they return an error if the return value is 0.
 pub fn cvt_gai(err: c_int) -> io::Result<()> {
-    if err == 0 {
-        Ok(())
-    } else {
-        Err(last_error())
-    }
+    if err == 0 { return Ok(()) }
+    cvt(err).map(|_| ())
 }
 
-/// Just to provide the same interface as sys/unix/net.rs
+/// Provides the functionality of `cvt` for a closure.
 pub fn cvt_r<T, F>(mut f: F) -> io::Result<T>
-    where T: One + PartialEq + Neg<Output=T>, F: FnMut() -> T
+    where F: FnMut() -> T, T: One + Neg<Output=T> + PartialEq
 {
     cvt(f())
 }