Bump Rust to 1.75 (#3815)

**This PR also bumps wasmtime version from 0.38 to 2.0 as 0.38 does not
build with Rust 1.75**. I did not test the plugin runtime as (AFAIK) we
intend to deprecate it; also, wasmtime's most recent version is 16.0, so
it'd make sense to bump the version at some point anyways. I did not
bump the version to 16.0 straight away as that'd require code changes in
`plugin_runtime`.
Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2023-12-28 19:22:43 +01:00 committed by GitHub
parent 772429c086
commit e932f4cf47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 320 additions and 209 deletions

507
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1.2
FROM rust:1.73-bullseye as builder
FROM rust:1.75-bullseye as builder
WORKDIR app
COPY . .

View File

@ -13,7 +13,6 @@ mod random_project_collaboration_tests;
mod randomized_test_helpers;
mod test_server;
pub use crate as collab2;
pub use randomized_test_helpers::{
run_randomized_test, save_randomized_test_plan, RandomizedTest, TestError, UserTestPlan,
};

View File

@ -1,6 +1,5 @@
use smol::future::FutureExt;
use std::{future::Future, time::Duration};
pub use util::*;
pub fn post_inc(value: &mut usize) -> usize {
let prev = *value;

View File

@ -2,7 +2,7 @@ pub use crate::{
diagnostic_set::DiagnosticSet,
highlight_map::{HighlightId, HighlightMap},
markdown::ParsedMarkdown,
proto, BracketPair, Grammar, Language, LanguageConfig, LanguageRegistry, PLAIN_TEXT,
proto, Grammar, Language, LanguageRegistry,
};
use crate::{
diagnostic_set::{DiagnosticEntry, DiagnosticGroup},

View File

@ -2,7 +2,7 @@ pub use crate::{
diagnostic_set::DiagnosticSet,
highlight_map::{HighlightId, HighlightMap},
markdown::ParsedMarkdown,
proto, BracketPair, Grammar, Language, LanguageConfig, LanguageRegistry, PLAIN_TEXT,
proto, Grammar, Language, LanguageRegistry,
};
use crate::{
diagnostic_set::{DiagnosticEntry, DiagnosticGroup},

View File

@ -5,9 +5,9 @@ edition = "2021"
publish = false
[dependencies]
wasmtime = "0.38"
wasmtime-wasi = "0.38"
wasi-common = "0.38"
wasmtime = "2.0"
wasmtime-wasi = "2.0"
wasi-common = "2.0"
anyhow.workspace = true
serde.workspace = true
serde_derive.workspace = true
@ -17,4 +17,4 @@ pollster = "0.2.5"
smol.workspace = true
[build-dependencies]
wasmtime = { version = "0.38", features = ["all-arch"] }
wasmtime = { version = "2.0", features = ["all-arch"] }

View File

@ -199,6 +199,7 @@ impl ButtonStyle {
}
}
#[allow(unused)]
pub(crate) fn disabled(self, cx: &mut WindowContext) -> ButtonLikeStyles {
match self {
ButtonStyle::Filled => ButtonLikeStyles {

View File

@ -28,7 +28,6 @@ pub use components::*;
pub use disableable::*;
pub use fixed::*;
pub use prelude::*;
pub use selectable::*;
pub use styled_ext::*;
pub use styles::*;
pub use visible_on_hover::*;

View File

@ -1,4 +1,4 @@
[toolchain]
channel = "1.73"
channel = "1.75"
components = [ "rustfmt" ]
targets = [ "x86_64-apple-darwin", "aarch64-apple-darwin", "wasm32-wasi" ]