Skip to content

Bump rust to 1.94 and nightly to 2026-01-18 #11218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kskalski merged 2 commits into from
Mar 18, 2026
Merged

Bump rust to 1.94 and nightly to 2026-01-18 #11218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fccc7a5
Bump rust to 1.94 and nightly to 2026-01-18
kskalski Feb 6, 2026
e9a043b
clippy(core): remove unsafe wrapping block in report_cpuid_values
kskalski Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/rust-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ fi
if [[ -n ${RUST_NIGHTLY_VERSION:-} ]]; then
nightly_version="$RUST_NIGHTLY_VERSION"
else
nightly_version=2025-12-05
nightly_version=2026-01-18
fi


Expand Down
154 changes: 76 additions & 78 deletions core/src/system_monitor_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,88 +726,86 @@ impl SystemMonitorService {
const CPUID_MANUFACTURER_EDX_AMD: u32 = 0x69746e65;
const CPUID_MANUFACTURER_ECX_AMD: u32 = 0x444d4163;

unsafe {
let cpuid_mfr = __cpuid(0);
let cpuid_empty = CpuidResult {
eax: 0,
ebx: 0,
ecx: 0,
edx: 0,
};

let max_leaf = match CpuidParamValue::try_from(std::cmp::min(
cpuid_mfr.eax,
CPUID_PARAM_MAX_SUPPORTED_VALUE,
)) {
Ok(val) => val,
Err(_err) => CpuidParamValue::Manufacturer,
};

let mfr_id = if cpuid_mfr.ebx == CPUID_MANUFACTURER_EBX_INTEL
&& cpuid_mfr.edx == CPUID_MANUFACTURER_EDX_INTEL
&& cpuid_mfr.ecx == CPUID_MANUFACTURER_ECX_INTEL
{
CpuManufacturer::Intel // GenuineIntel
} else if cpuid_mfr.ebx == CPUID_MANUFACTURER_EBX_AMD
&& cpuid_mfr.edx == CPUID_MANUFACTURER_EDX_AMD
&& cpuid_mfr.ecx == CPUID_MANUFACTURER_ECX_AMD
{
CpuManufacturer::Amd // AuthenticAMD
} else {
CpuManufacturer::Other // anything else
};
let cpuid_mfr = __cpuid(0);
let cpuid_empty = CpuidResult {
eax: 0,
ebx: 0,
ecx: 0,
edx: 0,
};

let cpuid_processor = if CpuidParamValue::Processor <= max_leaf {
__cpuid(CpuidParamValue::Processor.into())
} else {
cpuid_empty
};
let cpuid_cache = if CpuidParamValue::Cache <= max_leaf {
__cpuid(CpuidParamValue::Cache.into())
} else {
cpuid_empty
};
let cpuid_topology = if CpuidParamValue::Topology <= max_leaf {
__cpuid(CpuidParamValue::Topology.into())
} else {
cpuid_empty
};
let cpuid_extended_0 = if CpuidParamValue::Extended <= max_leaf {
__cpuid_count(CpuidParamValue::Extended.into(), 0)
} else {
cpuid_empty
};
let cpuid_extended_1 = if CpuidParamValue::Extended <= max_leaf {
if 1 <= __get_cpuid_max(CpuidParamValue::Extended.into()).1 {
__cpuid_count(CpuidParamValue::Extended.into(), 1)
} else {
cpuid_empty
}
let max_leaf = match CpuidParamValue::try_from(std::cmp::min(
cpuid_mfr.eax,
CPUID_PARAM_MAX_SUPPORTED_VALUE,
)) {
Ok(val) => val,
Err(_err) => CpuidParamValue::Manufacturer,
};

let mfr_id = if cpuid_mfr.ebx == CPUID_MANUFACTURER_EBX_INTEL
&& cpuid_mfr.edx == CPUID_MANUFACTURER_EDX_INTEL
&& cpuid_mfr.ecx == CPUID_MANUFACTURER_ECX_INTEL
{
CpuManufacturer::Intel // GenuineIntel
} else if cpuid_mfr.ebx == CPUID_MANUFACTURER_EBX_AMD
&& cpuid_mfr.edx == CPUID_MANUFACTURER_EDX_AMD
&& cpuid_mfr.ecx == CPUID_MANUFACTURER_ECX_AMD
{
CpuManufacturer::Amd // AuthenticAMD
} else {
CpuManufacturer::Other // anything else
};

let cpuid_processor = if CpuidParamValue::Processor <= max_leaf {
__cpuid(CpuidParamValue::Processor.into())
} else {
cpuid_empty
};
let cpuid_cache = if CpuidParamValue::Cache <= max_leaf {
__cpuid(CpuidParamValue::Cache.into())
} else {
cpuid_empty
};
let cpuid_topology = if CpuidParamValue::Topology <= max_leaf {
__cpuid(CpuidParamValue::Topology.into())
} else {
cpuid_empty
};
let cpuid_extended_0 = if CpuidParamValue::Extended <= max_leaf {
__cpuid_count(CpuidParamValue::Extended.into(), 0)
} else {
cpuid_empty
};
let cpuid_extended_1 = if CpuidParamValue::Extended <= max_leaf {
if 1 <= __get_cpuid_max(CpuidParamValue::Extended.into()).1 {
__cpuid_count(CpuidParamValue::Extended.into(), 1)
} else {
cpuid_empty
};

datapoint_info!(
"cpuid-values",
("manufacturer_id", i64::from(mfr_id), i64),
("cpuid_processor_eax", i64::from(cpuid_processor.eax), i64),
("cpuid_processor_ebx", i64::from(cpuid_processor.ebx), i64),
("cpuid_processor_ecx", i64::from(cpuid_processor.ecx), i64),
("cpuid_processor_edx", i64::from(cpuid_processor.edx), i64),
("cpuid_cache_eax", i64::from(cpuid_cache.eax), i64),
("cpuid_cache_ebx", i64::from(cpuid_cache.ebx), i64),
("cpuid_cache_ecx", i64::from(cpuid_cache.ecx), i64),
("cpuid_cache_edx", i64::from(cpuid_cache.edx), i64),
("cpuid_topology_eax", i64::from(cpuid_topology.eax), i64),
("cpuid_topology_ebx", i64::from(cpuid_topology.ebx), i64),
("cpuid_topology_ecx", i64::from(cpuid_topology.ecx), i64),
("cpuid_topology_edx", i64::from(cpuid_topology.edx), i64),
("cpuid_extended_0_ebx", i64::from(cpuid_extended_0.ebx), i64),
("cpuid_extended_0_ecx", i64::from(cpuid_extended_0.ecx), i64),
("cpuid_extended_0_edx", i64::from(cpuid_extended_0.edx), i64),
("cpuid_extended_1_eax", i64::from(cpuid_extended_1.eax), i64),
);
}
} else {
cpuid_empty
};

datapoint_info!(
"cpuid-values",
("manufacturer_id", i64::from(mfr_id), i64),
("cpuid_processor_eax", i64::from(cpuid_processor.eax), i64),
("cpuid_processor_ebx", i64::from(cpuid_processor.ebx), i64),
("cpuid_processor_ecx", i64::from(cpuid_processor.ecx), i64),
("cpuid_processor_edx", i64::from(cpuid_processor.edx), i64),
("cpuid_cache_eax", i64::from(cpuid_cache.eax), i64),
("cpuid_cache_ebx", i64::from(cpuid_cache.ebx), i64),
("cpuid_cache_ecx", i64::from(cpuid_cache.ecx), i64),
("cpuid_cache_edx", i64::from(cpuid_cache.edx), i64),
("cpuid_topology_eax", i64::from(cpuid_topology.eax), i64),
("cpuid_topology_ebx", i64::from(cpuid_topology.ebx), i64),
("cpuid_topology_ecx", i64::from(cpuid_topology.ecx), i64),
("cpuid_topology_edx", i64::from(cpuid_topology.edx), i64),
("cpuid_extended_0_ebx", i64::from(cpuid_extended_0.ebx), i64),
("cpuid_extended_0_ecx", i64::from(cpuid_extended_0.ecx), i64),
("cpuid_extended_0_edx", i64::from(cpuid_extended_0.edx), i64),
("cpuid_extended_1_eax", i64::from(cpuid_extended_1.eax), i64),
);
}

fn report_cpu_stats() {
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "1.93.1"
channel = "1.94.0"
Loading