---

yaml
---
r: 124254
b: refs/heads/try
c: e4801da
h: refs/heads/master
v: v3

Author: lightsofapollo

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 6c35d513cea468b30759b4f78becf28f11a123c0
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: afbcbbc77ffc6b10053bc543daf7d2e05d68cc01
-refs/heads/try: 4e2da7cb79143b0e7206a684629ed942599ec8e9
+refs/heads/try: e4801da62fb984981554864b3f196736b5c303e3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcore/result.rs

@@ -536,10 +536,7 @@ impl<T, E> Result<T, E> {
 impl<T, E: Show> Result<T, E> {
     /// Unwraps a result, yielding the content of an `Ok`.
     ///
-    /// # Failure
-    ///
-    /// Fails if the value is an `Err`, with a custom failure message provided
-    /// by the `Err`'s value.
+    /// Fails if the value is an `Err`.
     #[inline]
     pub fn unwrap(self) -> T {
         match self {
@@ -553,10 +550,7 @@ impl<T, E: Show> Result<T, E> {
 impl<T: Show, E> Result<T, E> {
     /// Unwraps a result, yielding the content of an `Err`.
     ///
-    /// # Failure
-    ///
-    /// Fails if the value is an `Ok`, with a custom failure message provided
-    /// by the `Ok`'s value.
+    /// Fails if the value is an `Ok`.
     #[inline]
     pub fn unwrap_err(self) -> E {
         match self {

branches/try/src/libglob/lib.rs

@@ -601,21 +601,21 @@ pub struct MatchOptions {
      * currently only considers upper/lower case relationships between ASCII characters,
      * but in future this might be extended to work with Unicode.
      */
-    case_sensitive: bool,
+    pub case_sensitive: bool,
 
     /**
      * If this is true then path-component separator characters (e.g. `/` on Posix)
      * must be matched by a literal `/`, rather than by `*` or `?` or `[...]`
      */
-    require_literal_separator: bool,
+    pub require_literal_separator: bool,
 
     /**
      * If this is true then paths that contain components that start with a `.` will
      * not match unless the `.` appears literally in the pattern: `*`, `?` or `[...]`
      * will not match. This is useful because such files are conventionally considered
      * hidden on Unix systems and it might be desirable to skip them when listing files.
      */
-    require_literal_leading_dot: bool
+    pub require_literal_leading_dot: bool
 }
 
 impl MatchOptions {

branches/try/src/libstd/io/mod.rs

@@ -293,7 +293,7 @@ pub type IoResult<T> = Result<T, IoError>;
 /// # FIXME
 ///
 /// Is something like this sufficient? It's kind of archaic
-#[deriving(PartialEq, Eq, Clone)]
+#[deriving(PartialEq, Clone)]
 pub struct IoError {
     /// An enumeration which can be matched against for determining the flavor
     /// of error.
@@ -435,7 +435,7 @@ impl fmt::Show for IoError {
 }
 
 /// A list specifying general categories of I/O error.
-#[deriving(PartialEq, Eq, Clone, Show)]
+#[deriving(PartialEq, Clone, Show)]
 pub enum IoErrorKind {
     /// Any I/O error not part of this list.
     OtherIoError,