Skip to content
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.

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

build: Upgrade to Rust v1.83. #661

Merged
merged 2 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

- Updated identifiers, versions, and locators to use [compact strings](https://crates.io/crates/compact_str).
- Updated wasmtime to v26 (from v23).
- Updated Rust to v1.83.

## 0.42.2

Expand Down
2 changes: 1 addition & 1 deletion crates/cli/src/commands/outdated.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ pub async fn outdated(session: ProtoSession, args: OutdatedArgs) -> AppResult {
for file in manager.files.iter().rev() {
if !file.exists
|| !env.config_mode.includes_global() && file.global
|| env.config_mode.only_local() && !file.path.parent().is_some_and(|p| p == env.cwd)
|| env.config_mode.only_local() && file.path.parent().is_none_or(|p| p != env.cwd)
{
continue;
}
Expand Down
2 changes: 1 addition & 1 deletion crates/cli/src/commands/status.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ fn find_versions_in_configs(
if !file.exists
|| !env.config_mode.includes_global() && file.global
|| env.config_mode.only_local()
&& !file.path.parent().is_some_and(|p| p == session.env.cwd)
&& file.path.parent().is_none_or(|p| p != session.env.cwd)
{
continue;
}
Expand Down
1 change: 1 addition & 0 deletions crates/cli/src/main_shim.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ static mut DEBUG: Option<bool> = None;
// We don't want to pull the entire `tracing` or `log` crates
// into this binary, as we want it to be super lean. So we have
// this very rudimentary logging system.
#[allow(static_mut_refs)]
fn debug(op: impl FnOnce() -> String) {
unsafe {
if DEBUG.is_none() {
Expand Down
6 changes: 3 additions & 3 deletions crates/cli/src/printer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ pub struct Printer<'std> {
depth: u8,
}

unsafe impl<'std> Send for Printer<'std> {}
unsafe impl<'std> Sync for Printer<'std> {}
unsafe impl Send for Printer<'_> {}
unsafe impl Sync for Printer<'_> {}

impl<'std> Printer<'std> {
impl Printer<'_> {
pub fn new() -> Self {
let stdout = std::io::stdout();
let buffer = BufWriter::new(stdout.lock());
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
profile = "default"
channel = "1.82.0"
channel = "1.83.0"