fix pycco-rs

[rust-101.git] / src / part07.rs

diff --git a/src/part07.rs b/src/part07.rs
index 49f6900de95a5eab4698365debadeab0ec75739a..2d88390c82f88956c91d2e3c3149288374bf7b29 100644 (file)
--- a/src/part07.rs
+++ b/src/part07.rs
@@ -4,8 +4,8 @@
 pub use part05::BigInt;
 
 // With our new knowledge of lifetimes, we are now able to write down the desired type of `min`:
 pub use part05::BigInt;
 
 // With our new knowledge of lifetimes, we are now able to write down the desired type of `min`:

-//@ We want the function to take two borrows *of the same lifetime*, and then
-//@ return a borrow of that lifetime. If the two input lifetimes would be different, we
+//@ We want the function to take two references *with the same lifetime*, and then
+//@ return a reference with that lifetime. If the two input lifetimes would be different, we

 //@ would not know which lifetime to use for the result.
 pub trait Minimum {
     fn min<'a>(&'a self, other: &'a Self) -> &'a Self;
 //@ would not know which lifetime to use for the result.
 pub trait Minimum {
     fn min<'a>(&'a self, other: &'a Self) -> &'a Self;


@@ -65,8 +65,8 @@ impl PartialEq for BigInt {
 //@ the "partial", I suggest you check out the documentation of [`PartialEq`](https://doc.rust-lang.org/std/cmp/trait.PartialEq.html)
 //@ and [`Eq`](https://doc.rust-lang.org/std/cmp/trait.Eq.html). `Eq` can be automatically derived as well.
 
 //@ the "partial", I suggest you check out the documentation of [`PartialEq`](https://doc.rust-lang.org/std/cmp/trait.PartialEq.html)
 //@ and [`Eq`](https://doc.rust-lang.org/std/cmp/trait.Eq.html). `Eq` can be automatically derived as well.
 

-// Now we can compare `BigInt`s. Rust treats `PratialEq` special in that it is wired to the operator `==`:
-//@ That operator can not be used on our numbers! Speaking in C++ terms, we just overloaded the `==` operator
+// Now we can compare `BigInt`s. Rust treats `PartialEq` special in that it is wired to the operator `==`:
+//@ That operator can now be used on our numbers! Speaking in C++ terms, we just overloaded the `==` operator

 //@ for `BigInt`. Rust does not have function overloading (i.e., it will not dispatch to different
 //@ functions depending on the type of the argument). Instead, one typically finds (or defines) a
 //@ trait that catches the core characteristic common to all the overloads, and writes a single
 //@ for `BigInt`. Rust does not have function overloading (i.e., it will not dispatch to different
 //@ functions depending on the type of the argument). Instead, one typically finds (or defines) a
 //@ trait that catches the core characteristic common to all the overloads, and writes a single


@@ -147,4 +147,4 @@ fn test_vec_min() {
 // of course, need a `Display` bound on `T`.) Then you should be able to use them with `println!` just like you do
 // with numbers, and get rid of the inherent functions to print `SomethingOrNothing<i32>` and `SomethingOrNothing<f32>`.
 
 // of course, need a `Display` bound on `T`.) Then you should be able to use them with `println!` just like you do
 // with numbers, and get rid of the inherent functions to print `SomethingOrNothing<i32>` and `SomethingOrNothing<f32>`.
 

-//@ [index](main.html) | [previous](part06.html) | [next](part08.html)
+//@ [index](main.html) | [previous](part06.html) | [raw source](https://www.ralfj.de/git/rust-101.git/blob_plain/HEAD:/workspace/src/part07.rs) | [next](part08.html)