Makes the build more robust and fixes compile errors and warnings

.gitignore

@@ -3,3 +3,4 @@ bin
 Cargo.lock
 .*
 *.swp
+rustc-ice-*.txt

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ncurses"
-version = "6.0.0"
+version = "6.0.1"
 authors = [ "[email protected]" ]
 description = "A very thin wrapper around the ncurses TUI library"
 documentation = "https://github.com/jeaye/ncurses-rs"
@@ -9,10 +9,27 @@ repository = "https://github.com/jeaye/ncurses-rs"
 readme = "README.md"
 keywords = ["ncurses","TUI"]
 license = "MIT"
+#If the edition field is not present in Cargo.toml, then the 2015 edition is assumed for backwards compatibility.
+#Set to avoid a warning with newer rust:
+#The Rust 2021 Edition was introduced in Rust 1.56.0.
+edition = "2021"
 build = "build.rs"
+#https://doc.rust-lang.org/cargo/reference/manifest.html#the-rust-version-field
+rust-version = "1.57.0"
+#Using this key rust-version= here aka MSRV, makes 1.56.0 be the minimum supported rust version(MSRV)
+#The first version of Cargo that supports this field was released with Rust 1.56.0. In older releases, the field will be ignored, and Cargo will display a warning.
+#Due to addr_of!() MSRV 1.51.0 is required minimum.
+#cc 1.0.92 requires 1.53.0 MSRV(but its `cargo test` passes only with 1.63.0),
+# however `cargo build` will pull latest cc due to Cargo.lock missing(on first repo clone)
+# and cc version specified isn't fixed like cc="=1.0.92", so:
+# due to latest cc pulled being 1.0.95(21Apr2024) it requires 1.63.0 MSRV (ie: `cargo msrv list`)
+#Due to build.rs' use of std::process::Command::get_*() MSRV is 1.57.0
+#To minimize MSRV further you can set `cc = "=1.0.92"` (note the extra "=") below then run `cargo update`
+# that makes MSRV be 1.53.0 minimum, but other things will raise it to 1.57.0
+#MSRV is 1.56.0 due to the above edition="2021"
 
 [build-dependencies]
-cc = "1.0.18"
+cc = "1.0.92"
 pkg-config = "0.3"
 
 [dependencies]

examples/ex_5.rs

@@ -1,6 +1,7 @@
 #[allow(unused_imports)]
 extern crate ncurses;
 
+#[cfg(feature="menu")]
 use ncurses::*;
 
 #[cfg(feature="menu")]
@@ -38,8 +39,8 @@ fn main() {
 
  /* Print a border around the main window */
  box_(my_menu_win, 0, 0);
- mvprintw(LINES() - 3, 0, "Press <ENTER> to see the option selected");
- mvprintw(LINES() - 2, 0, "F1 to exit");
+ mvprintw(LINES() - 3, 0, "Press <ENTER> to see the option selected").unwrap();//safe
+ mvprintw(LINES() - 2, 0, "F1 to exit").unwrap(); //safe
  refresh();
 
  /* Post the menu */
@@ -60,7 +61,8 @@ fn main() {
  10 => {/* Enter */
  mv(20, 0);
  clrtoeol();
- mvprintw(20, 0, &format!("Item selected is : {}", item_name(current_item(my_menu)))[..]);
+ mvprintw(20, 0, &format!("Item selected is : {}", item_name(current_item(my_menu)))[..]).unwrap();
+ //unwrap() here is safe unless the items have any \0 (nul) char in them, then it will panic!
  pos_menu_cursor(my_menu);
  },
  _ => {}

examples/ex_7.rs

@@ -10,14 +10,15 @@
 
 extern crate ncurses;
 
+#[cfg(feature = "wide")]
 use std::char;
 use ncurses::*;
 
 #[cfg(feature = "wide")]
 fn main()
 {
  let locale_conf = LcCategory::all;
- setlocale(locale_conf, "en_US.UTF-8");
+ setlocale(locale_conf, "en_US.UTF-8").unwrap();//safe due to this &str having no \0 in it
 
  /* Setup ncurses. */
  initscr();
@@ -56,7 +57,7 @@ fn main()
 
  Some(WchResult::Char(c)) => {
  /* Enable attributes and output message. */
- addstr("\nKey pressed: ");
+ addstr("\nKey pressed: ").unwrap();//safe, no \0 in this &str
  attron(A_BOLD | A_BLINK);
  addstr(format!("{}\n", char::from_u32(c as u32).expect("Invalid char")).as_ref()).unwrap();
  attroff(A_BOLD | A_BLINK);

shell.nix

@@ -5,9 +5,10 @@ pkgs.stdenv.mkDerivation
  name = "ncurses-rs";
  buildInputs = with pkgs;
  [
+ pkgs.pkg-config
  pkgs.cargo
  pkgs.rustup
  pkgs.rustfmt
- pkgs.ncurses5
+ pkgs.ncurses
  ];
 }

src/constants.rs

@@ -17,8 +17,8 @@ use super::ll::*;
 
 mod wrapped {
  use libc::{ c_char, c_int };
- use ll::chtype;
- use ll::WINDOW;
+ use crate::ll::chtype;
+ use crate::ll::WINDOW;
 
  extern "C"
  {
@@ -58,7 +58,9 @@ wrap_extern!(LINES: c_int);
 wrap_extern!(TABSIZE: c_int);
 pub fn acs_map() -> *const chtype {
  unsafe {
- &wrapped::acs_map as *const chtype
+ std::ptr::addr_of!(wrapped::acs_map) as *const chtype
+ // addr_of! needs minimum rust 1.51.0, if want lower, try this instead:
+ // &wrapped::acs_map as *const chtype
  }
 }