Skip to content

Commit 8267df7

Browse files
fiji-flofiji-flo
committed
update(deps): update all and move to workspace
1 parent 2981fea commit 8267df7

File tree

21 files changed

+364
-283
lines changed

21 files changed

+364
-283
lines changed

‎Cargo.lock

+234-198
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+29
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,35 @@ license = "MPL-2.0"
3232
authors = ["Florian Dieminger <[email protected]>"]
3333
rust-version = "1.80"
3434

35+
[workspace.dependencies]
36+
rari-doc = { path = "crates/rari-doc" }
37+
rari-tools = { path = "crates/rari-tools" }
38+
rari-deps = { path = "crates/rari-deps" }
39+
rari-types = { path = "crates/rari-types" }
40+
rari-utils = { path = "crates/rari-utils" }
41+
rari-md = { path = "crates/rari-md" }
42+
rari-data = { path = "crates/rari-data" }
43+
rari-templ-func = { path = "crates/rari-templ-func" }
44+
rari-l10n = { path = "crates/rari-l10n" }
45+
46+
tracing = "0.1"
47+
thiserror = "1"
48+
serde = { version = "1", features = ["derive"] }
49+
serde_json = { version = "1", features = ["preserve_order"] }
50+
chrono = { version = "0.4", features = ["serde"] }
51+
regex = "1"
52+
url = { version = "2", features = ["serde"] }
53+
concat-in-place = "1"
54+
itertools = "0.13"
55+
constcat = "0.5"
56+
anyhow = "1"
57+
indexmap = { version = "2", features = ["serde"] }
58+
regress = "0.10"
59+
html-escape = "0.2"
60+
ignore = "0.4"
61+
rayon = "1"
62+
63+
3564
[dependencies]
3665
anyhow = "1"
3766
clap = { version = "4.5.1", features = ["derive"] }

‎crates/css-definition-syntax/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
thiserror = "1"
10+
thiserror.workspace = true

‎crates/css-syntax-types/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
regress = "0.10"
11-
serde_json = { version = "1", features = ["preserve_order"] }
12-
serde = { version = "1", features = ["derive"] }
13-
url = { version = "2", features = ["serde"] }
10+
serde_json.workspace = true
11+
serde.workspace = true
12+
url.workspace = true
13+
regress.workspace = true

‎crates/css-syntax/Cargo.toml

+9-8
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
thiserror = "1"
11-
regress = "0.10"
12-
serde_json = { version = "1", features = ["preserve_order"] }
13-
serde = { version = "1", features = ["derive"] }
14-
url = { version = "2", features = ["serde"] }
10+
thiserror.workspace = true
11+
regress.workspace = true
12+
serde_json.workspace = true
13+
serde.workspace = true
14+
url.workspace = true
15+
html-escape.workspace = true
16+
rari-deps.workspace = true
17+
rari-types = { workspace = true, optional = true }
18+
1519
css-syntax-types = { path = "../css-syntax-types" }
1620
css-definition-syntax = { path = "../css-definition-syntax" }
17-
html-escape = "0.2"
18-
rari-deps = { path = "../rari-deps" }
19-
rari-types = { path = "../rari-types", optional = true }
2021

2122
[build-dependencies]
2223
anyhow = "1"

‎crates/diff-test/Cargo.toml

+9-8
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,18 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
anyhow = "1"
11-
clap = { version = "4.5.1", features = ["derive"] }
12-
ignore = "0.4"
13-
serde = { version = "1", features = ["derive"] }
14-
serde_json = { version = "1", features = ["preserve_order"] }
10+
rayon.workspace = true
11+
anyhow.workspace = true
12+
ignore.workspace = true
13+
itertools.workspace = true
14+
regex.workspace = true
15+
serde.workspace = true
16+
serde_json.workspace = true
17+
1518
jsonpath_lib = "0.3.0"
1619
prettydiff = "0.7"
1720
html-minifier = "5"
1821
ansi-to-html = "0.2"
19-
itertools = "0.13"
2022
similar = "2"
21-
regex = "1"
2223
htmldiff = "0.1"
23-
rayon = "1"
24+
clap = { version = "4.5.1", features = ["derive"] }

‎crates/rari-data/Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
rari-utils = { path = "../rari-utils" }
11-
thiserror = "1"
12-
serde = { version = "1", features = ["derive"] }
13-
serde_json = { version = "1", features = ["preserve_order"] }
14-
url = { version = "2", features = ["serde"] }
15-
chrono = { version = "0.4", features = ["serde"] }
16-
indexmap = "2"
10+
rari-utils.workspace = true
11+
thiserror.workspace = true
12+
serde.workspace = true
13+
serde_json.workspace = true
14+
url.workspace = true
15+
chrono.workspace = true
16+
indexmap.workspace = true

‎crates/rari-deps/Cargo.toml

+6-5
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
rari-utils = { path = "../rari-utils" }
11-
thiserror = "1"
12-
serde = { version = "1", features = ["derive"] }
13-
serde_json = { version = "1", features = ["preserve_order"] }
10+
rari-utils.workspace = true
11+
serde.workspace = true
12+
serde_json.workspace = true
13+
chrono.workspace = true
14+
thiserror.workspace = true
15+
1416
css-syntax-types = { path = "../css-syntax-types" }
1517
tar = "0.4"
1618
flate2 = "1"
17-
chrono = { version = "0.4", features = ["serde"] }
1819

1920
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
2021
reqwest = { version = "0.12", default-features = false, features = [

‎crates/rari-doc/Cargo.toml

+22-18
Original file line numberDiff line numberDiff line change
@@ -7,47 +7,51 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
thiserror = "1"
11-
serde = { version = "1", features = ["derive"] }
12-
serde_json = { version = "1", features = ["preserve_order"] }
10+
thiserror.workspace = true
11+
serde.workspace = true
12+
serde_json.workspace = true
13+
regex.workspace = true
14+
tracing.workspace = true
15+
url.workspace = true
16+
itertools.workspace = true
17+
concat-in-place.workspace = true
18+
constcat.workspace = true
19+
indexmap.workspace = true
20+
1321
serde_yaml = "0.9"
1422
yaml-rust = "0.4"
1523
percent-encoding = "2"
1624
pest = "2"
1725
pest_derive = "2"
18-
regex = "1"
1926
validator = { version = "0.18", features = ["derive"] }
20-
scraper = { version = "0.19", features = ["deterministic"] }
2127
chrono = { version = "0.4", features = ["serde"] }
28+
29+
scraper = { version = "0.20", features = ["deterministic"] }
2230
lol_html = "1"
2331
html-escape = "0.2"
2432
html5ever = "0.27"
25-
tracing = "0.1"
33+
ego-tree = "0.6"
34+
2635
ignore = "0.4"
2736
crossbeam-channel = "0.5"
2837
rayon = "1"
2938
enum_dispatch = "0.3"
3039
icu_collator = "1"
3140
icu_locid = "1"
3241
strum = { version = "0.26", features = ["derive"] }
33-
ego-tree = "0.6"
34-
url = "2"
3542
imagesize = "0.13"
3643
svg_metadata = "0.5"
37-
itertools = "0.13"
3844
memoize = "0.4"
39-
concat-in-place = "1"
40-
indexmap = "2"
41-
constcat = "0.5"
4245
phf_macros = "0.11"
4346
phf = "0.11"
4447

45-
rari-utils = { path = "../rari-utils" }
46-
rari-types = { path = "../rari-types" }
47-
rari-md = { path = "../rari-md" }
48-
rari-data = { path = "../rari-data" }
49-
rari-templ-func = { path = "../rari-templ-func" }
50-
rari-l10n = { path = "../rari-l10n" }
48+
rari-utils.workspace = true
49+
rari-types.workspace = true
50+
rari-md.workspace = true
51+
rari-data.workspace = true
52+
rari-templ-func.workspace = true
53+
rari-l10n.workspace = true
54+
5155
css-syntax = { path = "../css-syntax", features = ["rari"] }
5256

5357
[dev-dependencies]

‎crates/rari-doc/src/helpers/subpages.rs

+1
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ pub fn get_sub_pages(
223223
}
224224

225225
#[memoize(SharedCache)]
226+
#[allow(non_snake_case)]
226227
fn read_sub_folders_cached(
227228
folder: PathBuf,
228229
depth: Option<usize>,

‎crates/rari-doc/src/pages/json.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ pub struct JsonBasicSPA {
300300
#[serde(rename_all = "camelCase")]
301301
pub struct HomePageFeaturedArticle {
302302
pub mdn_url: String,
303-
pub summay: String,
303+
pub summary: String,
304304
pub title: String,
305305
pub tag: Option<Parent>,
306306
}

‎crates/rari-doc/src/pages/title.rs

+3
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ pub fn root_doc_url(url: &str) -> Option<&str> {
5656
if url[m[1]..].starts_with("/docs/Web/") {
5757
return Some(&url[..*m.get(4).unwrap_or(&url.len())]);
5858
}
59+
if url[m[1]..].starts_with("/docs/conflicting/") || url[m[1]..].starts_with("/docs/orphaned/") {
60+
return None;
61+
}
5962
Some(&url[..*m.get(3).unwrap_or(&url.len())])
6063
}
6164

‎crates/rari-doc/src/pages/types/spa_homepage.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ pub fn featured_articles(
4949
match url_path_to_page_with_other_locale_and_fallback(url, Some(locale)) {
5050
Ok(Page::BlogPost(post)) => Some(Ok(HomePageFeaturedArticle {
5151
mdn_url: post.url().to_string(),
52-
summay: post.meta.description.clone(),
52+
summary: post.meta.description.clone(),
5353
title: post.title().to_string(),
5454
tag: Some(Parent {
5555
uri: strcat!("/" Locale::default().as_url_str() "/blog/"),
@@ -58,7 +58,7 @@ pub fn featured_articles(
5858
})),
5959
Ok(ref page @ Page::Doc(ref doc)) => Some(Ok(HomePageFeaturedArticle {
6060
mdn_url: doc.url().to_string(),
61-
summay: get_hacky_summary_md(page).unwrap_or_default(),
61+
summary: get_hacky_summary_md(page).unwrap_or_default(),
6262
title: doc.title().to_string(),
6363
tag: parents(page).get(1).cloned(),
6464
})),

‎crates/rari-l10n/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
rari-types = { path = "../rari-types" }
11-
thiserror = "1"
12-
serde_json = { version = "1", features = ["preserve_order"] }
10+
rari-types.workspace = true
11+
thiserror.workspace = true
12+
serde_json.workspace = true

‎crates/rari-linter/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
thiserror = "1"
10+
thiserror.workspace = true

‎crates/rari-md/Cargo.toml

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
anyhow = "1"
10+
anyhow.workspace = true
11+
regex.workspace = true
12+
thiserror.workspace = true
13+
rari-types.workspace = true
14+
itertools.workspace = true
15+
1116
base64 = "0.22"
12-
regex = "1"
13-
thiserror = "1"
14-
comrak = { version = "0.26", default-features = false }
15-
rari-types = { path = "../rari-types" }
16-
itertools = "0.13"
17+
comrak = { version = "0.28", default-features = false }

‎crates/rari-templ-func/Cargo.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ rust-version.workspace = true
1010
proc-macro = true
1111

1212
[dependencies]
13+
rari-types.workspace = true
14+
1315
syn = { version = "2", features = ["full"] }
1416
quote = "1"
15-
rari-types = { path = "../rari-types" }
1617

1718
[dev-dependencies]
18-
anyhow = "1"
19+
anyhow.workspace = true

‎crates/rari-tools/Cargo.toml

+10-9
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
rari-types = { path = "../rari-types" }
11-
rari-utils = { path = "../rari-utils" }
12-
thiserror = "1"
13-
serde = { version = "1", features = ["derive"] }
14-
serde_json = { version = "1", features = ["preserve_order"] }
10+
rari-types.workspace = true
11+
rari-utils.workspace = true
12+
thiserror.workspace = true
13+
serde.workspace = true
14+
serde_json.workspace = true
15+
chrono.workspace = true
16+
tracing.workspace = true
17+
concat-in-place.workspace = true
18+
1519
csv = "1"
16-
chrono = { version = "0.4", features = ["serde"] }
17-
tracing = "0.1"
18-
concat-in-place = "1"
1920

2021
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
2122
reqwest = { version = "0.12", default-features = false, features = [
@@ -32,4 +33,4 @@ reqwest = { version = "0.12", default-features = false, features = [
3233
] }
3334

3435
[dev-dependencies]
35-
rari-types = { path = "../rari-types", features = ["testing"] }
36+
rari-types = { workspace = true, features = ["testing"] }

‎crates/rari-types/Cargo.toml

+7-5
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ testing = []
1111
default = []
1212

1313
[dependencies]
14-
thiserror = "1"
15-
serde = { version = "1", features = ["derive"] }
14+
thiserror.workspace = true
15+
serde.workspace = true
16+
serde_json.workspace = true
17+
indexmap.workspace = true
18+
chrono.workspace = true
19+
20+
1621
serde_variant = "0.1"
17-
serde_json = { version = "1", features = ["preserve_order"] }
1822
normalize-path = "0.2"
1923
strum = { version = "0.26", features = ["derive"] }
2024
dirs = "5"
2125
config = { version = "0.14", default-features = false, features = ["toml"] }
22-
chrono = { version = "0.4", features = ["serde"] }
23-
indexmap = { version = "2", features = ["serde"] }

‎crates/rari-utils/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ license.workspace = true
77
rust-version.workspace = true
88

99
[dependencies]
10-
thiserror = "1"
11-
serde = { version = "1", features = ["derive"] }
12-
serde_json = { version = "1", features = ["preserve_order"] }
13-
tracing = "0.1"
10+
thiserror.workspace = true
11+
serde.workspace = true
12+
serde_json.workspace = true
13+
tracing.workspace = true

‎src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ fn main() -> Result<(), anyhow::Error> {
181181
};
182182
println!("Took: {: >10.3?} for {}", start.elapsed(), docs.len());
183183
}
184-
if !args.skip_spas {
184+
if !args.skip_spas && args.files.is_empty() {
185185
let start = std::time::Instant::now();
186186
urls.extend(build_spas()?);
187187
urls.extend(build_generic_pages()?);

0 commit comments

Comments
 (0)