Remove nightly things

Author: rtldg

Makefile.toml

@@ -309,7 +309,7 @@ dependencies = [
 ################################################################################
 
 [tasks.linux]
-toolchain = "nightly"
+#toolchain = "nightly"
 command = "cargo"
 # CS:S binaries are now at 2.29 according to this:
 #   objdump -T bin/*.so | grep GLIBC | sed 's/.*GLIBC_\([.0-9]*\).*/\1/g' | sort -Vu
@@ -320,7 +320,7 @@ args = ["zigbuild", "--release", "--target", "${TARGETARCH}-unknown-linux-gnu.2.
 dependencies = ["windows"]
 
 [tasks.windows]
-toolchain = "nightly"
+#toolchain = "nightly"
 command = "cargo"
 #env = { "CARGO_LOG" = "cargo::core::compiler::fingerprint=info" }
 args = ["build", "--release", "--target", "${TARGETARCH}-pc-windows-msvc"]
@@ -336,12 +336,12 @@ args = ["build", "--release", "--target", "${TARGETARCH}-pc-windows-msvc"]
 ################################################################################
 
 [tasks.rustup-linux]
-toolchain = "nightly"
+#toolchain = "nightly"
 command = "rustup"
 args = ["target", "add", "${TARGETARCH}-unknown-linux-gnu"]
 
 [tasks.rustup-windows]
-toolchain = "nightly"
+#toolchain = "nightly"
 command = "rustup"
 args = ["target", "add", "${TARGETARCH}-pc-windows-msvc"]
 

rust-toolchain.toml

@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+// Copyright (c) The Rust Project Contributors/Developers
+
+// Snipped out of https://github.com/rust-lang/rust/blob/master/library/core/src/net/ip_addr.rs
+
+// TODO: Wait for the `ip` feature to stablize: https://github.com/rust-lang/rust/issues/27709
+
+use std::net::Ipv4Addr;
+
+pub const fn is_shared(addr: &Ipv4Addr) -> bool {
+	addr.octets()[0] == 100 && (addr.octets()[1] & 0b1100_0000 == 0b0100_0000)
+}
+
+pub const fn is_benchmarking(addr: &Ipv4Addr) -> bool {
+	addr.octets()[0] == 198 && (addr.octets()[1] & 0xfe) == 18
+}
+
+pub const fn is_reserved(addr: &Ipv4Addr) -> bool {
+	addr.octets()[0] & 240 == 240 && !addr.is_broadcast()
+}
+
+pub const fn is_global(addr: &Ipv4Addr) -> bool {
+	!(addr.octets()[0] == 0 // "This network"
+		|| addr.is_private()
+		|| is_shared(addr)
+		|| addr.is_loopback()
+		|| addr.is_link_local()
+		// addresses reserved for future protocols (`192.0.0.0/24`)
+		// .9 and .10 are documented as globally reachable so they're excluded
+		|| (
+			addr.octets()[0] == 192 && addr.octets()[1] == 0 && addr.octets()[2] == 0
+			&& addr.octets()[3] != 9 && addr.octets()[3] != 10
+		)
+		|| addr.is_documentation()
+		|| is_benchmarking(addr)
+		|| is_reserved(addr)
+		|| addr.is_broadcast())
+}

srcwrhttp/src/ip_addr.rs

@@ -3,13 +3,9 @@
 // This file is part of srcwrtimer (https://github.com/srcwr/srcwrtimer/)
 
 #![allow(non_snake_case)]
-#![feature(ip)]
-#![feature(let_chains)]
-// TODO: >the feature `option_get_or_insert_default` has been stable since 1.83.0-nightly and no longer requires an attribute to enable
-#![allow(stable_features)]
-#![feature(option_get_or_insert_default)]
 
 mod http_thread;
+mod ip_addr;
 mod natives_http;
 mod reqwest_text_with_charset;
 mod server_ip;

srcwrhttp/src/lib.rs

@@ -15,6 +15,8 @@ use std::net::IpAddr;
 use std::net::Ipv4Addr;
 use std::str::FromStr;
 
+use crate::ip_addr;
+
 unsafe extern "C" {
 	pub fn SteamWorks_GetPublicIP() -> u32;
 }
@@ -34,7 +36,7 @@ pub fn commandline_bindip() -> Option<IpAddr> {
 	for a in std::env::args() {
 		if next_is_ip {
 			let ip = Ipv4Addr::from_str(&a).ok()?;
-			return if ip.is_global() { Some(ip.into()) } else { None };
+			return if ip_addr::is_global(&ip) { Some(ip.into()) } else { None };
 		}
 		next_is_ip = a == "-ip" || a == "+ip";
 	}

srcwrhttp/src/server_ip.rs

@@ -3,7 +3,6 @@
 // This file is part of srcwrtimer (https://github.com/srcwr/srcwrtimer/)
 
 #![allow(non_snake_case)]
-#![feature(let_chains)]
 
 mod natives_json;