Skip to content

Commit

Permalink
rust 1.84.0 && cargo update
Browse files Browse the repository at this point in the history
  • Loading branch information
amitu committed Jan 10, 2025
1 parent 31718bc commit 2521c2b
Show file tree
Hide file tree
Showing 15 changed files with 224 additions and 310 deletions.
312 changes: 116 additions & 196 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ async-recursion = "1"
async-trait = "0.1"
camino = "1"
clap = "4"
colored = "2"
colored = "3"
css-color-parser = "0.1"
diffy = "0.4"
dotenvy = "0.15"
Expand Down Expand Up @@ -106,7 +106,7 @@ futures-core = "0.3"
ignore = "0.4"
include_dir = "0.7"
indoc = "2"
itertools = "0.13"
itertools = "0.14"
http = "1"
bytes = "1"
mime_guess = "2"
Expand Down Expand Up @@ -183,7 +183,7 @@ features = [

[workspace.dependencies.comrak]
# We use comrak for markup processing.
version = "0.32"
version = "0.33"
# By default, comrak ships with support for syntax highlighting using syntext for "fenced
# code blocks". We have disabled that by not using default features. We did that because
# we already have a way to show code in ftd, ftd.code. Further, comark requires syntect 4.6,
Expand Down
4 changes: 2 additions & 2 deletions fastn-core/src/library2022/processor/document.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@ pub fn document_suffix(
})
}

pub async fn document_name<'a>(
pub async fn document_name(
value: ftd_ast::VariableValue,
_kind: fastn_resolved::Kind,
doc: &ftd::interpreter::TDoc<'a>,
doc: &ftd::interpreter::TDoc<'_>,
req_config: &fastn_core::RequestConfig,
preview_session_id: &Option<String>,
) -> ftd::interpreter::Result<fastn_resolved::Value> {
Expand Down
4 changes: 2 additions & 2 deletions fastn-core/src/library2022/processor/user_group.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ pub async fn get_identities(
}

// is user can_read the document or not based on defined readers in sitemap
pub async fn is_reader<'a>(
pub async fn is_reader(
_value: ftd_ast::VariableValue,
_kind: fastn_resolved::Kind,
_doc: &ftd::interpreter::TDoc<'a>,
_doc: &ftd::interpreter::TDoc<'_>,
_req_config: &fastn_core::RequestConfig,
) -> ftd::interpreter::Result<fastn_resolved::Value> {
Err(ftd::interpreter::Error::OtherError(
Expand Down
2 changes: 1 addition & 1 deletion ftd-ast/src/component.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ impl ComponentDefinition {
}

pub fn is_component_definition(section: &ftd_p1::Section) -> bool {
section.kind.as_ref().map_or(false, |s| s.eq(COMPONENT))
section.kind.as_ref().is_some_and(|s| s.eq(COMPONENT))
}

pub fn from_p1(
Expand Down
2 changes: 1 addition & 1 deletion ftd-ast/src/or_type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ impl OrType {
}

pub(crate) fn is_or_type(section: &ftd_p1::Section) -> bool {
section.kind.as_ref().map_or(false, |s| s.eq(ORTYPE))
section.kind.as_ref().is_some_and(|s| s.eq(ORTYPE))
}

pub(crate) fn from_p1(section: &ftd_p1::Section, doc_id: &str) -> ftd_ast::Result<OrType> {
Expand Down
2 changes: 1 addition & 1 deletion ftd-ast/src/record.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ impl Record {
section
.kind
.as_ref()
.map_or(false, |s| s.eq(ftd_ast::constants::RECORD))
.is_some_and(|s| s.eq(ftd_ast::constants::RECORD))
}

pub(crate) fn from_p1(section: &ftd_p1::Section, doc_id: &str) -> ftd_ast::Result<Record> {
Expand Down
2 changes: 1 addition & 1 deletion ftd-ast/src/web_component.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ impl WebComponentDefinition {
}

pub fn is_web_component_definition(section: &ftd_p1::Section) -> bool {
section.kind.as_ref().map_or(false, |s| s.eq(WEB_COMPONENT))
section.kind.as_ref().is_some_and(|s| s.eq(WEB_COMPONENT))
}

pub fn from_p1(
Expand Down
2 changes: 1 addition & 1 deletion ftd/src/ftd2021/di/record.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pub const RECORD: &str = "record";

impl Record {
pub(crate) fn is_record(section: &ftd_p1::Section) -> bool {
section.kind.as_ref().map_or(false, |s| s.eq(RECORD))
section.kind.as_ref().is_some_and(|s| s.eq(RECORD))
}

pub(crate) fn from_p1(
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]
channel = "1.83.0"
channel = "1.84.0"

Loading

0 comments on commit 2521c2b

Please sign in to comment.