Skip to content

Update dependencies #542

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

Merged
merged 8 commits into from
Feb 28, 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
2 changes: 1 addition & 1 deletion .code-samples.meilisearch.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This code-samples file is used by the Meilisearch documentation
# Every example written here will be automatically fetched by
# the documentation on build
# You can read more on https://github.com/meilisearch/documentation/tree/master/.vuepress/code-samples
# You can read more on https://github.com/meilisearch/documentation/tree/main/learn
---
synonyms_guide_1: |-
let mut synonyms = std::collections::HashMap::new();
Expand Down
4 changes: 1 addition & 3 deletions .github/scripts/check-release.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#!/bin/sh

# Checking if current tag matches the package version
current_tag=$(echo $GITHUB_REF | cut -d '/' -f 3 | sed -r 's/^v//')
major=$(echo $current_tag | cut -d '.' -f1)
minor=$(echo $current_tag | cut -d '.' -f2)
current_tag=$(echo "$GITHUB_REF" | cut -d '/' -f 3 | sed -r 's/^v//')

file1='Cargo.toml'
file2='README.tpl'
Expand Down
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ curl -L https://install.meilisearch.com | sh # download Meilisearch
cargo test
```

There is two kind of tests, documentation tests and unit tests.
There are two kinds of tests, documentation tests and unit tests.
If you need to write or read the unit tests you should consider reading this
[readme](meilisearch-test-macro/README.md) about our custom testing macro.

Expand Down Expand Up @@ -91,13 +91,13 @@ rustup update

Each PR should pass the format test to be accepted.

Run the following to fix the formating errors:
Run the following to fix the formatting errors:

```
cargo fmt
```

and the following to test if the formating is correct:
and the following to test if the formatting is correct:
```
cargo fmt --all -- --check
```
Expand Down Expand Up @@ -139,7 +139,7 @@ We do not enforce any branch naming style, but please use something descriptive

As minimal requirements, your commit message should:
- be capitalized
- not finish by a dot or any other punctuation character (!,?)
- not finished by a dot or any other punctuation character (!,?)
- start with a verb so that we can read your commit message this way: "This commit will ...", where "..." is the commit message.
e.g.: "Fix the home page button" or "Add more tests for create_index method"

Expand Down Expand Up @@ -171,7 +171,7 @@ _[Read more about this](https://github.com/meilisearch/integration-guides/blob/m

### How to Publish the Release <!-- omit in toc -->

⚠️ Before doing anything, make sure you got through the guide about [Releasing an Integration](https://github.com/meilisearch/integration-guides/blob/main/resources/integration-release.md).
⚠️ Before doing anything, make sure you get through the guide about [Releasing an Integration](https://github.com/meilisearch/integration-guides/blob/main/resources/integration-release.md).

Make a PR modifying the file [`Cargo.toml`](/Cargo.toml):

Expand Down Expand Up @@ -212,4 +212,4 @@ GitHub Actions will be triggered and push the package to [crates.io](https://cra

<hr>

Thank you again for reading this through. We can not wait to begin to work with you if you make your way through this contributing guide ❤️
Thank you again for reading this through. We cannot wait to begin to work with you if you make your way through this contributing guide ❤️
4 changes: 1 addition & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@ log = "0.4"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
time = { version = "0.3.7", features = ["serde-well-known", "formatting", "parsing"] }
jsonwebtoken = { version = "8", default-features = false }
jsonwebtoken = { version = "9", default-features = false }
yaup = "0.2.0"
either = { version = "1.8.0", features = ["serde"] }
thiserror = "1.0.37"
meilisearch-index-setting-macro = { path = "meilisearch-index-setting-macro", version = "0.24.3" }


[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
futures = "0.3"
futures-io = "0.3.26"
Expand All @@ -43,7 +42,6 @@ isahc-static-curl = ["isahc/static-curl"]
isahc-static-ssl = ["isahc/static-ssl"]

[dev-dependencies]
env_logger = "0.11"
futures-await-test = "0.3"
futures = "0.3"
mockito = "1.0.0"
Expand Down
20 changes: 10 additions & 10 deletions examples/cli-app/assets/clothes.json
Original file line number Diff line number Diff line change
@@ -1,74 +1,74 @@
[
{
"id": 1,
"seaon": "winter",
"season": "winter",
"article": "sweater",
"cost": 63.40,
"size":"L",
"pattern":"striped"
},
{
"id": 2,
"seaon": "spring",
"season": "spring",
"article": "sweat pants",
"cost": 18.00,
"size":"XXXL",
"pattern":"floral"
},
{
"id": 3,
"seaon": "fall",
"season": "fall",
"article": "t-shirt",
"cost": 1634.90,
"size":"M",
"pattern":"solid black"
},
{
"id": 4,
"seaon": "summer",
"season": "summer",
"article": "tank top",
"cost": 3.40,
"size":"L",
"pattern":"diagonal"
},
{
"id": 5,
"seaon": "winter",
"season": "winter",
"article": "jeans",
"cost": 4.20,
"size":"XL",
"pattern":"striped"
},
{
"id": 6,
"seaon": "spring",
"season": "spring",
"article": "sun dress",
"cost": 12634.56,
"size":"L",
"pattern":"floral"
},
{
"id": 7,
"seaon": "fall",
"season": "fall",
"article": "sweatshirt",
"cost": 90.80,
"size":"M",
"pattern":"checker"
},
{
"id": 8,
"seaon": "summer",
"season": "summer",
"article": "shorts",
"cost": 16.34,
"size":"XS",
"pattern":"solid beige"
},
{
"id": 9,
"seaon": "winter",
"season": "winter",
"article": "jacket",
"cost": 634,
"size":"L",
"pattern":"camo"
}
]
]
6 changes: 3 additions & 3 deletions examples/cli-app/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ fn main() {
}

async fn search(query: &str) {
// make the search query, which excutes and serializes hits into the
// make the search query, which executes and serializes hits into the
// ClothesDisplay struct
let query_results = CLIENT
.index("clothes")
Expand Down Expand Up @@ -74,7 +74,7 @@ async fn build_index() {
let ranking_rules = ["words", "typo", "attribute", "exactness", "cost:asc"];

// create searchable attributes
let searchable_attributes = ["seaon", "article", "size", "pattern"];
let searchable_attributes = ["season", "article", "size", "pattern"];

// create the synonyms hashmap
let mut synonyms = std::collections::HashMap::new();
Expand Down Expand Up @@ -128,7 +128,7 @@ async fn build_index() {
#[derive(Serialize, Deserialize, Debug)]
pub struct Clothes {
id: usize,
seaon: String,
season: String,
article: String,
cost: f32,
size: String,
Expand Down
2 changes: 1 addition & 1 deletion examples/web_app/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ fn header_content(processing_time_ms: usize, link: &Scope<Model>) -> Html {
{"We wrote a blog post about "}<a href="https://blog.meilisearch.com/meili-finds-rust-crates/">{"how we made this search engine available for you"}</a>{"."}<br/>
{"What you are currently using is not the original front end, but a clone using "}<a href="https://github.com/meilisearch/meilisearch-rust">{"the Meilisearch Rust SDK"}</a>{" and "}<a href="https://yew.rs">{"Yew"}</a>{". The code is available "}<a href="https://github.com/meilisearch/meilisearch-rust/tree/main/examples/web_app">{"here"}</a>{"."}<br/>
{"The whole design was taken from "}<a href="https://lib.rs">{"lib.rs"}</a>{" because we love it."}<br/>
<br/>{"We pull new crates and crates updates every "}<em>{"10 minutes"}</em>{" from "}<a href="https://docs.rs/releases">{"docs.rs"}</a>{" and all the downloads counts "}<em>{"every day at 3:30 PM UTC"}</em>{" from "}<a href="https://crates.io/data-access">{"crates.io"}</a>{". Currently we have something like "}<em>{" 31 729 crates"}</em>{"."}<br/>
<br/>{"We pull new crates and crates update every "}<em>{"10 minutes"}</em>{" from "}<a href="https://docs.rs/releases">{"docs.rs"}</a>{" and all the downloads count "}<em>{"every day at 3:30 PM UTC"}</em>{" from "}<a href="https://crates.io/data-access">{"crates.io"}</a>{". Currently we have something like "}<em>{" 31 729 crates"}</em>{"."}<br/>
<br/>{"Have fun using it "}<img draggable="false" class="emoji" alt="⌨️" src="moz-extension://57a82bfe-3134-4c34-bdb1-bc4ada430e6c/data/components/twemoji/svg/2328.svg"/>{" "}<img draggable="false" class="emoji" alt="💨" src="moz-extension://57a82bfe-3134-4c34-bdb1-bc4ada430e6c/data/components/twemoji/svg/1f4a8.svg"/><br/>
</p>
<form role="search" id="search">
Expand Down
6 changes: 3 additions & 3 deletions meilisearch-index-setting-macro/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "meilisearch-index-setting-macro"
version = "0.24.3"
description = "Helper tool to generate settings of an Meilisearch index"
description = "Helper tool to generate settings of a Meilisearch index"
edition = "2021"
license = "MIT"

Expand All @@ -11,8 +11,8 @@ license = "MIT"
proc-macro = true

[dependencies]
syn = { version = "1.0.102", features = ["extra-traits"] }
syn = { version = "2.0.48", features = ["extra-traits"] }
quote = "1.0.21"
proc-macro2 = "1.0.46"
convert_case = "0.6.0"

structmeta = "0.3"
Loading