Std: simplify variants

nois-lang · Feb 11, 2024 · 8950314 · 8950314
1 parent 7d15999
commit 8950314
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/src/std/iter/intersperseIter.no b/src/std/iter/intersperseIter.no
@@ -8,7 +8,7 @@ impl <T> Iter<T> for IntersperseIter<T> {
     fn next(self): Option<T> {
         if self.needsSeparator && self.iter.peek().isSome() {
             self.needsSeparator = false
-            Option::Some(self.separator)
+            Some(self.separator)
         } else {
             self.needsSeparator = true
             self.iter.next()
@@ -22,7 +22,7 @@ pub trait IntersperseAdapter<Self: Iter<T>, T> {
 
 impl <T> IntersperseAdapter<T> for Iter<T> {
     fn intersperse(self, separator: T): IntersperseIter<T> {
-        IntersperseIter::IntersperseIter(iter: self, separator: separator, needsSeparator: false)
+        IntersperseIter(iter: self, separator, needsSeparator: false)
     }
 }
 
diff --git a/src/std/iter/mapIter.no b/src/std/iter/mapIter.no
@@ -15,7 +15,7 @@ pub trait MapAdapter<Self: Iter<T>, T> {
 
 impl <T> MapAdapter<T> for Iter<T> {
     fn map<U>(self, f: |T|: U): MapIter<T, U> {
-        MapIter::MapIter(iter: self, f: f)
+        MapIter(iter: self, f: f)
     }
 }
 
diff --git a/src/std/iter/peekable.no b/src/std/iter/peekable.no
@@ -6,16 +6,16 @@ pub type PeekableIter<T>(
 impl <T> Iter<T> for PeekableIter<T> {
     fn next(self): Option<T> {
         match self.peeked.take() {
-            Option::Some(value) { value }
-            Option::None() { self.iter.next() }
+            Some(value) { value }
+            None() { self.iter.next() }
         }
     }
 
     fn peek(self): Option<T> {
         match self.peeked {
-            Option::Some(value) { value }
-            Option::None() {
-                self.peeked = Option::Some(value: self.iter.next())
+            Some(value) { value }
+            None() {
+                self.peeked = Some(self.iter.next())
                 self.peeked
             }
         }
@@ -28,7 +28,7 @@ pub trait PeekableAdapter<Self: Iter<T>, T> {
 
 impl <T> PeekableAdapter<T> for Iter<T> {
     fn peek<U>(self): PeekableIter<T> {
-        PeekableIter::PeekableIter(iter: self, peeked: Option::None())
+        PeekableIter(iter: self, peeked: None())
     }
 }
 
diff --git a/src/std/list.no b/src/std/list.no
@@ -14,7 +14,7 @@ impl <T> List<T> {
 
 impl <T> Iterable<T> for List<T> {
     fn iter(self): ListIter<T> {
-        ListIter::ListIter(list: self, index: 0)
+        ListIter(list: self, index: 0)
     }
 }
 
@@ -23,8 +23,8 @@ impl <T> Collector<T> for List<T> {
         let list = []
         while true {
             match iter.next() {
-                Option::Some(value) { list.add(value) }
-                Option::None() { break }
+                Some(value) { list.add(value) }
+                None() { break }
             }
         }
         list
@@ -58,11 +58,11 @@ pub type ListIter<T>(
 impl <T> Iter<T> for ListIter<T> {
     fn next(self): Option<T> {
         match self.list.at(self.index) {
-            Option::Some(value) {
+            Some(value) {
                 self.index = self.index + 1
-                Option::Some(value)
+                Some(value)
             }
-            _ { Option::None() }
+            _ { None() }
         }
     }
 }

diff --git a/src/std/result.no b/src/std/result.no
@@ -6,13 +6,13 @@ pub type Result<T, E> {
 impl <T, E> Result<T, E> {
     pub fn isOk(self): Bool {
         match self {
-            Result::Ok() { true }
+            Ok() { true }
             _ { false }
         }
     }
     pub fn isError(self): Bool {
         match self {
-            Result::Error() { true }
+            Error() { true }
             _ { false }
         }
     }

diff --git a/src/std/unit.no b/src/std/unit.no
@@ -1,4 +1,4 @@
 pub type Unit()
 
-pub let unit: Unit = Unit::Unit()
+pub let unit: Unit = Unit()