src/fop.rs

@@ -39,7 +39,7 @@ fn main() {
 	let mut d = '\u{1E}'.to_string(); /* ASCII record separator */
 	let mut optind = 1;
 
-	#[cfg(target_os="openbsd")] {
+	if cfg!(target_os="openbsd") {
 		let promises = Promises::new("stdio proc exec");
 		if let Err(e) = pledge(Some(promises), None) {
 			eprintln!("{}: {}", argv[0], e.strerror());

src/hru.rs

@@ -86,7 +86,7 @@ fn main() -> ExitCode {
 		return ExitCode::from(EX_USAGE as u8);
 	}
 
-	#[cfg(target_os="openbsd")] {
+	if cfg!(target_os="openbsd") {
 		let promises = Promises::new("stdio");
 		if let Err(e) = pledge(Some(promises), None) {
 			eprintln!("{}: {}", argv[0], e.strerror());

src/intcmp.rs

@@ -42,7 +42,7 @@ fn usage(s: &str) -> ExitCode {
 fn main() -> ExitCode {
 	let argv = args().collect::<Vec<String>>();
 
-	#[cfg(target_os="openbsd")] {
+	if cfg!(target_os="openbsd") {
 		let promises = Promises::new("stdio");
 		if let Err(e) = pledge(Some(promises), None) {
 			eprintln!("{}: {}", argv[0], e.strerror());

src/mm.rs

@@ -51,7 +51,7 @@ fn main() -> ExitCode {
 	let argv = args().collect::<Vec<_>>();
 	let usage = format!("Usage: {} [-aetu] [-i input] [-o output]", argv[0]);
 
-	#[cfg(target_os="openbsd")] {
+	if cfg!(target_os="openbsd") {
 		let promises = Promises::new("rpath stdio unveil");
 		if let Err(e) = pledge(Some(promises), None) {
 			eprintln!("{}: {}", argv[0], e.strerror());
@@ -77,7 +77,7 @@ fn main() -> ExitCode {
 			Ok("i") => { /* add inputs */
 				let input = opt.arg().unwrap();
 
-				#[cfg(target_os="openbsd")] {
+				if cfg!(target_os="openbsd") {
 					let perms = UnveilPerms::new(vec!['r']);
 					if let Err(e) = unveil(Some(&input), Some(perms)) {
 						eprintln!("{}: {}", argv[0], e.strerror());
@@ -91,7 +91,7 @@ fn main() -> ExitCode {
 			Ok("o") => { /* add output */
 				let output = opt.arg().unwrap(); 
 
-				#[cfg(target_os="openbsd")] {
+				if cfg!(target_os="openbsd") {
 					let perms = UnveilPerms::new(vec!['w', 'c']);
 					if let Err(e) = unveil(Some(&output), Some(perms)) {
 						eprintln!("{}: {}", argv[0], e.strerror());
@@ -124,7 +124,7 @@ fn main() -> ExitCode {
 		}
 	}
 
-	#[cfg(target_os="openbsd")] {
+	if cfg!(target_os="openbsd") {
 		if let Err(e) = unveil(None, None) {
 			eprintln!("{}: {}", argv[0], e.strerror());
 			return ExitCode::from(EX_OSERR as u8);

src/rpn.rs

@@ -198,7 +198,7 @@ fn round_precise(value: &f64, precision: usize) -> f64 {
 fn main() -> ExitCode {
 	let argv = args().collect::<Vec<String>>();
 
-	#[cfg(target_os="openbsd")] {
+	if cfg!(target_os="openbsd") {
 		let promises = Promises::new("stdio");
 		if let Err(e) = pledge(Some(promises), None) {
 			eprintln!("{}: {}", argv[0], e.strerror());

src/swab.rs

@@ -54,7 +54,7 @@ fn usage(s: &str) -> ExitCode {
 fn main() -> ExitCode {
 	let argv = args().collect::<Vec<String>>();
 	
-	#[cfg(target_os="openbsd")] {
+	if cfg!(target_os="openbsd") {
 		let promises = Promises::new("stdio");
 		if let Err(e) = pledge(Some(promises), None) {
 			return oserr(&argv[0], e);

tests/bonsai/dj.mk

@@ -19,7 +19,7 @@ dj_tests: dj_help dj_full dj_null # dj_skip_stdin
 dj_full: $(BIN)/dj /dev/full
 	case "$$(uname)" in \
 	Linux) \
-		! $(BIN)/dj -Hi /dev/zero -o /dev/full 2>&1 \
+		$(BIN)/dj -Hi /dev/zero -o /dev/full 2>&1 \
 			| tee /dev/stderr \
 			| xargs -I out test '1+0 > 0+0; 1024 > 0' = out \
 		;; \

tests/bonsai/rpn.mk

@@ -30,7 +30,7 @@ rpn_mul: $(BIN)/rpn
 .PHONY: rpn_div
 rpn_div: $(BIN)/rpn
 	test "$$($(BIN)/rpn 12 5 /)" = 2.4
-	test "$$($(BIN)/rpn 3 0 /)" = inf
+	test "$$($(BIN)/rpn 3 0 /)" -eq inf
 
 .PHONY: rpn_mod
 rpn_mod: $(BIN)/rpn