Lesson 1.7: Rectangle.to_sdl() method needs to return Option

[FFX01]

Currently, the code in the lesson looks like this:

//  ~/src/phi/data.rs
// ...
pub fn to_sdl(self) -> Option<SdlRect> {
    assert!(self.w >= 0.0 && self.h >= 0.0);
    SdlRect::new(
        self.x as i32, self.y as i32, self.w as u32, self.h as u32
    )
}

With newer version of sdl2(v0.24.0 specifically) this will fail at the compile step as Renderer.copy() expects 2 Option<Rect>'s as arguments. I'm fairly new to Rust, but I fixed the issue by changing the code to the following:

pub fn to_sdl(self) -> Option<SdlRect> {
    assert!(self.w >= 0.0 && self.h >= 0.0);
    Some(SdlRect::new(
        self.x as i32, self.y as i32, self.w as u32, self.h as u32
    ))
}

Let me know if you think this a good solution.

[akien-mga]

See #34 where I've started working on porting the tutorials to sdl2 0.24.0. I've also faced the same issue and went for the same solution that you propose (the other alternative I saw would be to remove the Option<...> part, but it implies lots of removed unwraps everywhere, so it was way more intrusive).

[FFX01]

Oh, wow. You've been hard at work there. Any particular areas you need assistance? Like I said, I'm new at Rust, but I'm willing to learn.