Upgrade Rust toolchain to 1.85 (#11720)

## Summary

* Upgrade the rust toolchain to 1.85.0. This does not increase the MSRV.
* Update windows trampoline to 1.86 nightly beta (previously in 1.85
nightly beta).

## Test Plan

Existing tests
This commit is contained in:
samypr100 2025-02-23 10:52:34 -05:00 committed by GitHub
parent 3c541e2368
commit 878497a014
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
21 changed files with 51 additions and 56 deletions

View file

@ -1187,7 +1187,7 @@ fn find_dependencies(
let mut to_replace = Vec::new();
for (i, dep) in deps.iter().enumerate() {
if let Some(req) = dep.as_str().and_then(try_parse_requirement) {
if marker.map_or(true, |m| *m == req.marker) && *name == req.name {
if marker.is_none_or(|m| *m == req.marker) && *name == req.name {
to_replace.push((i, req));
}
}