mirror of
https://github.com/spacedriveapp/spacedrive
synced 2024-07-04 12:13:27 +00:00
Pin rust to 1.73 (Workaround Internal Compiler Error) (#1796)
* Pin rust to 1.73 - Clippy fixes * Don't install cargo-watch on CI
This commit is contained in:
parent
ae31e10e0b
commit
f3ad0d7513
2
.github/actions/setup-rust/action.yaml
vendored
2
.github/actions/setup-rust/action.yaml
vendored
|
@ -16,7 +16,7 @@ runs:
|
|||
uses: dtolnay/rust-toolchain@stable
|
||||
with:
|
||||
target: ${{ inputs.target }}
|
||||
toolchain: stable
|
||||
toolchain: '1.73'
|
||||
components: clippy, rustfmt
|
||||
|
||||
- name: Cache Rust Dependencies
|
||||
|
|
|
@ -71,7 +71,7 @@ To run the landing page:
|
|||
|
||||
If you encounter any issues, ensure that you are using the following versions of Rust, Node and Pnpm:
|
||||
|
||||
- Rust version: **1.70.0**
|
||||
- Rust version: **1.73.0**
|
||||
- Node version: **18.17**
|
||||
- Pnpm version: **8.0.0**
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ name = "sd-core"
|
|||
version = "0.1.2"
|
||||
description = "Virtual distributed filesystem engine that powers Spacedrive."
|
||||
authors = ["Spacedrive Technology Inc."]
|
||||
rust-version = "1.70.0"
|
||||
rust-version = "1.73.0"
|
||||
license = { workspace = true }
|
||||
repository = { workspace = true }
|
||||
edition = { workspace = true }
|
||||
|
|
|
@ -136,8 +136,8 @@ impl ObjectFilterArgs {
|
|||
vec![
|
||||
not![date_accessed::equals(None)],
|
||||
match v {
|
||||
Range::From(v) => date_accessed::gte(v.into()),
|
||||
Range::To(v) => date_accessed::lte(v.into()),
|
||||
Range::From(v) => date_accessed::gte(v),
|
||||
Range::To(v) => date_accessed::lte(v),
|
||||
},
|
||||
]
|
||||
}
|
||||
|
|
|
@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
|
|||
use specta::Type;
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::{api::utils::library, invalidate_query, library::Library, prisma::saved_search};
|
||||
use crate::{api::utils::library, library::Library, prisma::saved_search};
|
||||
|
||||
use super::{Ctx, R};
|
||||
|
||||
|
@ -111,7 +111,7 @@ pub(crate) fn mount() -> AlphaRouter<Ctx> {
|
|||
let result: Result<Vec<SavedSearchResponse>, _> = searches
|
||||
.into_iter()
|
||||
.map(|search| {
|
||||
let filters_bytes = search.filters.unwrap_or_else(Vec::new);
|
||||
let filters_bytes = search.filters.unwrap_or_default();
|
||||
|
||||
let filters_string = String::from_utf8(filters_bytes).unwrap();
|
||||
let filters: Vec<Filter> = serde_json::from_str(&filters_string).unwrap();
|
||||
|
|
2
rust-toolchain.toml
Normal file
2
rust-toolchain.toml
Normal file
|
@ -0,0 +1,2 @@
|
|||
[toolchain]
|
||||
channel = "1.73"
|
|
@ -234,7 +234,9 @@ case "$(uname)" in
|
|||
;;
|
||||
esac
|
||||
|
||||
if [ "${CI:-}" != "true" ]; then
|
||||
echo "Installing Rust tools..."
|
||||
cargo install cargo-watch
|
||||
fi
|
||||
|
||||
echo 'Your machine has been setup for Spacedrive development!'
|
||||
|
|
Loading…
Reference in a new issue