Fix FreeBSD compiler error

[oleiade]

Hi @stanislav-tkach 👋🏻

While putting together a FreeBSD port for one of my rust crates, I encountered compilation errors from the os_info crate. Both with the OS' (FreeBSD 14.0) rust pkg, embedding the rust compiler version 1.72, and with the rustup default stable compiler version 1.76.

This Pull Request applies the fix recommended by the compiler and replaces the -s flag passed into the uname command by the -r flag, which does return the release number on FreeBSD (just like on OpenBSD), as opposed to -s which only returns the name of the os "FreeBSD". I assumed this wasn't intentional, but if it was, let me know, and I'll happily drop the change from the PR.

For reference, here's the compiler error I was encountering:

error[E0308]: mismatched types
  --> os_info/src/freebsd/mod.rs:28:9
   |
27 |     match uname("-s").as_deref() {
   |           ---------------------- this expression has type `std::option::Option<&str>`
28 |         "MidnightBSD" => Type::MidnightBSD,
   |         ^^^^^^^^^^^^^ expected `Option<&str>`, found `&str`
   |
   = note:   expected enum `std::option::Option<&str>`
           found reference `&'static str`
help: try wrapping the pattern in `Some`
   |
28 |         Some("MidnightBSD") => Type::MidnightBSD,
   |         +++++             +

error[E0308]: mismatched types
  --> os_info/src/freebsd/mod.rs:29:9
   |
27 |     match uname("-s").as_deref() {
   |           ---------------------- this expression has type `std::option::Option<&str>`
28 |         "MidnightBSD" => Type::MidnightBSD,
29 |         "FreeBSD" => {
   |         ^^^^^^^^^ expected `Option<&str>`, found `&str`
   |
   = note:   expected enum `std::option::Option<&str>`
           found reference `&'static str`
help: try wrapping the pattern in `Some`
   |
29 |         Some("FreeBSD") => {
   |         +++++         +

For more information about this error, try `rustc --explain E0308`.
error: could not compile `os_info` (lib) due to 2 previous errors

Let me know what you think and if you'd prefer any done differently 👍🏻

Thank you 🙇🏻

[stanislav-tkach]

Thank you for the pull request! This is once again a result of my last minute refactoring before the release. 🙃 I think that -s should be used in the get_os function because in that case we are matching over the operating system name, but you are right that -r should be used to obtain a version.

[oleiade]

Good catch, you're absolutely right 👀 👍🏻

I've adjusted the PR to reflect the changes suggested in your comment indeed 🙇🏻

[davidkna]

I would appreciate a release with this.

This has caused the FreeBSD-build for the recent starship release to fail, and I may need to do another patch-up release soon, where it would be nice to have FreeBSD-builds again.

[stanislav-tkach]

@davidkna I have published the 3.8.2 version and yanked both 3.8.0 and 3.8.1. Sorry for the inconvenience!

[davidkna]

Thanks!

[oleiade]

Thank you @stanislav-tkach much appreciated 🙇🏻