From 75db9f08c273dab30a7d1879377fbc41d66fc8f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Tue, 10 Dec 2024 19:25:26 +0100 Subject: [PATCH 01/10] WIP --- .github/renovate.json5 | 14 -------------- renovate.json | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 14 deletions(-) delete mode 100644 .github/renovate.json5 create mode 100644 renovate.json diff --git a/.github/renovate.json5 b/.github/renovate.json5 deleted file mode 100644 index 87f5f103ddfca..0000000000000 --- a/.github/renovate.json5 +++ /dev/null @@ -1,14 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - // Let Renovatebot keep an opened issue that tracks our dependencies - "dependencyDashboard": true, - // Disable "normal" package updates - "enabledManagers": [], - // Update lockfiles once per week - "lockFileMaintenance": { - "enabled": true, - "schedule": [ - "before 5am on Tuesday" - ] - } -} diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000000000..05156b63819d2 --- /dev/null +++ b/renovate.json @@ -0,0 +1,28 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "schedule": "at any time", + "dependencyDashboard": true, + "branchPrefix": "renovatebot/", + "enabledManagers": [ + "cargo" + ], + "forkProcessing": "enabled", + "includePaths": [ + "src/bootstrap/Cargo.toml", + "library/Cargo.toml" + ], + "packageRules": [{ + "matchFileNames": ["src/bootstrap/Cargo.toml"], + "enabled": true, + "groupName": "bootstrap Cargo.lock" + }, { + "matchFileNames": ["library/Cargo.toml"], + "enabled": true, + "groupName": "library Cargo.lock" + }], + "rangeStrategy": "in-range-only", + "lockFileMaintenance": { + "enabled": true, + "schedule": "at any time" + } +} From 5a35c28e3d65f669ee5f9d011fcf305406f2ba93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Tue, 10 Dec 2024 19:34:19 +0100 Subject: [PATCH 02/10] WIP --- renovate.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/renovate.json b/renovate.json index 05156b63819d2..d912c9b2525ee 100644 --- a/renovate.json +++ b/renovate.json @@ -12,10 +12,6 @@ "library/Cargo.toml" ], "packageRules": [{ - "matchFileNames": ["src/bootstrap/Cargo.toml"], - "enabled": true, - "groupName": "bootstrap Cargo.lock" - }, { "matchFileNames": ["library/Cargo.toml"], "enabled": true, "groupName": "library Cargo.lock" From a48698a719f0985b229279294b6fd277acbda3a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Tue, 10 Dec 2024 19:34:36 +0100 Subject: [PATCH 03/10] WIP --- renovate.json | 1 - 1 file changed, 1 deletion(-) diff --git a/renovate.json b/renovate.json index d912c9b2525ee..af548a385d03a 100644 --- a/renovate.json +++ b/renovate.json @@ -8,7 +8,6 @@ ], "forkProcessing": "enabled", "includePaths": [ - "src/bootstrap/Cargo.toml", "library/Cargo.toml" ], "packageRules": [{ From 2ec95f611c90441ef5dbda2c974db34979d4f6c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Tue, 10 Dec 2024 19:40:54 +0100 Subject: [PATCH 04/10] WIP --- renovate.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/renovate.json b/renovate.json index af548a385d03a..06c24dc65dd96 100644 --- a/renovate.json +++ b/renovate.json @@ -8,13 +8,8 @@ ], "forkProcessing": "enabled", "includePaths": [ - "library/Cargo.toml" + "library/**" ], - "packageRules": [{ - "matchFileNames": ["library/Cargo.toml"], - "enabled": true, - "groupName": "library Cargo.lock" - }], "rangeStrategy": "in-range-only", "lockFileMaintenance": { "enabled": true, From 05b4f1924ee4e5263d4a724586028634b9c2d015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Tue, 10 Dec 2024 20:10:33 +0100 Subject: [PATCH 05/10] WIP --- renovate.json | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index 06c24dc65dd96..a3bf29384c5c6 100644 --- a/renovate.json +++ b/renovate.json @@ -2,14 +2,24 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "schedule": "at any time", "dependencyDashboard": true, - "branchPrefix": "renovatebot/", + "prHourlyLimit": 0, "enabledManagers": [ "cargo" ], "forkProcessing": "enabled", "includePaths": [ - "library/**" + "src/tools/rustbook/Cargo.toml", + "src/bootstrap/Cargo.toml" ], + "packageRules": [{ + "matchFileNames": ["src/tools/rustbook/Cargo.toml"], + "enabled": true, + "groupName": "rustbook Cargo.lock" + }, { + "matchFileNames": ["src/bootstrap/Cargo.toml"], + "enabled": true, + "groupName": "bootstrap Cargo.lock" + }], "rangeStrategy": "in-range-only", "lockFileMaintenance": { "enabled": true, From 6ecef6a12d485bc4456cefee1156c15d6df2a27c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Tue, 10 Dec 2024 20:17:39 +0100 Subject: [PATCH 06/10] WIP --- renovate.json | 1 + 1 file changed, 1 insertion(+) diff --git a/renovate.json b/renovate.json index a3bf29384c5c6..743edb7b78faa 100644 --- a/renovate.json +++ b/renovate.json @@ -3,6 +3,7 @@ "schedule": "at any time", "dependencyDashboard": true, "prHourlyLimit": 0, + "cloneSubmodules": true, "enabledManagers": [ "cargo" ], From d7c0d3a0157e9585f55fbbccb1108ef1ab9e3363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Tue, 10 Dec 2024 21:04:19 +0100 Subject: [PATCH 07/10] WIP --- renovate.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/renovate.json b/renovate.json index 743edb7b78faa..4eadbd72e08e6 100644 --- a/renovate.json +++ b/renovate.json @@ -3,19 +3,21 @@ "schedule": "at any time", "dependencyDashboard": true, "prHourlyLimit": 0, - "cloneSubmodules": true, + "customEnvVariables": { + "RUSTC_BOOTSTRAP": "1" + }, "enabledManagers": [ "cargo" ], "forkProcessing": "enabled", "includePaths": [ - "src/tools/rustbook/Cargo.toml", + "library/**", "src/bootstrap/Cargo.toml" ], "packageRules": [{ - "matchFileNames": ["src/tools/rustbook/Cargo.toml"], + "matchFileNames": ["library/Cargo.toml", "library/**/Cargo.toml"], "enabled": true, - "groupName": "rustbook Cargo.lock" + "groupName": "library Cargo.lock" }, { "matchFileNames": ["src/bootstrap/Cargo.toml"], "enabled": true, From 7710927745c2a5f4041cd4524ee6e878dfb18e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Tue, 10 Dec 2024 21:35:45 +0100 Subject: [PATCH 08/10] WIP --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 4eadbd72e08e6..9dae0937743b2 100644 --- a/renovate.json +++ b/renovate.json @@ -3,7 +3,7 @@ "schedule": "at any time", "dependencyDashboard": true, "prHourlyLimit": 0, - "customEnvVariables": { + "env": { "RUSTC_BOOTSTRAP": "1" }, "enabledManagers": [ From 00e6acb23e6285a03426a7935b0c7749d207d0f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Sun, 22 Dec 2024 12:13:15 +0100 Subject: [PATCH 09/10] WIP --- renovate.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 9dae0937743b2..b269f36644dd1 100644 --- a/renovate.json +++ b/renovate.json @@ -9,10 +9,16 @@ "enabledManagers": [ "cargo" ], + "cloneSubmodules": true, + "cloneSubmodulesFilter": [ + "!src/llvm-project", + "!src/gcc" + ], "forkProcessing": "enabled", "includePaths": [ "library/**", - "src/bootstrap/Cargo.toml" + "src/bootstrap/Cargo.toml", + "src/tools/rustbook/Cargo.toml" ], "packageRules": [{ "matchFileNames": ["library/Cargo.toml", "library/**/Cargo.toml"], @@ -22,6 +28,10 @@ "matchFileNames": ["src/bootstrap/Cargo.toml"], "enabled": true, "groupName": "bootstrap Cargo.lock" + }, { + "matchFileNames": ["src/tools/rustbook/Cargo.toml"], + "enabled": true, + "groupName": "rustbook Cargo.lock" }], "rangeStrategy": "in-range-only", "lockFileMaintenance": { From 625361587618d727cc3a60bf700758cc02d540e4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 12:56:41 +0000 Subject: [PATCH 10/10] Lock file maintenance rustbook Cargo.lock --- src/tools/rustbook/Cargo.lock | 145 ++++++++++++++++++++++++++-------- 1 file changed, 112 insertions(+), 33 deletions(-) diff --git a/src/tools/rustbook/Cargo.lock b/src/tools/rustbook/Cargo.lock index b5b360db252fe..57b3a686ad741 100644 --- a/src/tools/rustbook/Cargo.lock +++ b/src/tools/rustbook/Cargo.lock @@ -190,9 +190,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.23" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" +checksum = "9560b07a799281c7e0958b9296854d6fafd4c5f31444a7e5bb1ad6dde5ccf1bd" dependencies = [ "clap_builder", "clap_derive", @@ -200,9 +200,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.23" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" +checksum = "874e0dd3eb68bf99058751ac9712f622e61e6f393a94f7128fa26e3f02f5c7cd" dependencies = [ "anstream", "anstyle", @@ -213,18 +213,18 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.40" +version = "4.5.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac2e663e3e3bed2d32d065a8404024dad306e699a04263ec59919529f803aee9" +checksum = "942dc5991a34d8cf58937ec33201856feba9cbceeeab5adf04116ec7c763bff1" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.5.18" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c" dependencies = [ "heck", "proc-macro2", @@ -278,6 +278,41 @@ dependencies = [ "typenum", ] +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn", +] + [[package]] name = "dateparser" version = "0.2.1" @@ -301,6 +336,37 @@ dependencies = [ "winapi", ] +[[package]] +name = "derive_builder" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" +dependencies = [ + "derive_builder_core", + "syn", +] + [[package]] name = "digest" version = "0.10.7" @@ -452,17 +518,18 @@ dependencies = [ [[package]] name = "handlebars" -version = "6.2.0" +version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4ccde012831f9a071a637b0d4e31df31c0f6c525784b35ae76a9ac6bc1e315" +checksum = "3d6b224b95c1e668ac0270325ad563b2eef1469fbbb8959bc7c692c844b813d9" dependencies = [ + "derive_builder", "log", "num-order", "pest", "pest_derive", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.9", ] [[package]] @@ -653,6 +720,12 @@ dependencies = [ "syn", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "1.0.3" @@ -739,9 +812,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "litemap" @@ -1046,21 +1119,21 @@ dependencies = [ [[package]] name = "phf" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" dependencies = [ - "phf_shared 0.11.2", + "phf_shared 0.11.3", ] [[package]] name = "phf_codegen" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", + "phf_generator 0.11.3", + "phf_shared 0.11.3", ] [[package]] @@ -1075,11 +1148,11 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" dependencies = [ - "phf_shared 0.11.2", + "phf_shared 0.11.3", "rand", ] @@ -1089,16 +1162,16 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] name = "phf_shared" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" dependencies = [ - "siphasher", + "siphasher 1.0.1", ] [[package]] @@ -1298,9 +1371,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.42" +version = "0.38.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" +checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6" dependencies = [ "bitflags 2.6.0", "errno", @@ -1358,9 +1431,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "itoa", "memchr", @@ -1400,6 +1473,12 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + [[package]] name = "smallvec" version = "1.13.2" @@ -1446,9 +1525,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.94" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote",