X-Git-Url: https://git.ralfj.de/rust-101.git/blobdiff_plain/4f61be32dd480f23a7fef05ee66c42ae27c980c6..a43cc90b79e0b17302c74982270e29a4b93f5f0f:/src/part02.rs?ds=sidebyside diff --git a/src/part02.rs b/src/part02.rs index 41bb3bc..1af74fc 100644 --- a/src/part02.rs +++ b/src/part02.rs @@ -22,7 +22,7 @@ pub use self::SomethingOrNothing::*; type NumberOrNothing = SomethingOrNothing; //@ However, we can also write `SomethingOrNothing` or even `SomethingOrNothing>`. //@ In fact, such a type is so useful that it is already present in the standard library: It's called an -//@ *option type*, written `Option`. Go check out its [documentation](http://doc.rust-lang.org/stable/std/option/index.html)! +//@ *option type*, written `Option`. Go check out its [documentation](https://doc.rust-lang.org/stable/std/option/index.html)! //@ (And don't worry, there's indeed lots of material mentioned there that we did not cover yet.) // ## Generic `impl`, Static functions @@ -62,7 +62,7 @@ fn call_constructor(x: i32) -> SomethingOrNothing { //@ So, as a first step towards a generic `vec_min`, we define a `Minimum` trait. //@ For now, just ignore the `Copy`, we will come back to this point later. //@ A `trait` is a lot like interfaces in Java: You define a bunch of functions -//@ you want to have implemented, and their argument and return types.
+//@ you want to have implemented, and their argument and return types.
//@ The function `min` takes to arguments of the same type, but I made the //@ first argument the special `self` argument. I could, alternatively, have //@ made `min` a static function as follows: `fn min(a: Self, b: Self) -> Self`. @@ -79,7 +79,7 @@ pub trait Minimum : Copy { //@ //@ There is a crucial difference to templates in C++: We actually have to declare which traits //@ we want the type to satisfy. If we left away the `Minimum`, Rust would have complained that -//@ we cannot call `min`. Just try it!
+//@ we cannot call `min`. Just try it!
//@ This is in strong contrast to C++, where the compiler only checks such details when the //@ function is actually used. pub fn vec_min(v: Vec) -> SomethingOrNothing {