From 8e9dccd62bb8fb6898286484e525e0cc45fdc204 Mon Sep 17 00:00:00 2001 From: Luyi Date: Wed, 20 Jul 2022 14:36:57 -0700 Subject: [PATCH 1/2] Update Cargo.toml fix the branch not found issue and also cyclic dependency issue --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f538a2b0..aecc4bc9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,5 +66,5 @@ exclude = [ ] [patch.crates-io] -fluent-templates = { git = "https://github.com/robjtede/fluent-templates.git", branch = "fix-circ-dep" } -fluent-template-macros = { git = "https://github.com/robjtede/fluent-templates.git", branch = "fix-circ-dep" } +fluent-templates = { git = "https://github.com/XAMPPRocky/fluent-templates.git"} +fluent-template-macros = { git = "https://github.com/XAMPPRocky/fluent-templates.git"} From 2a0be8e52ae86896e8c75dcf6f38a86bfe7fc7c1 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Wed, 20 Jul 2022 22:44:26 +0100 Subject: [PATCH 2/2] Update Cargo.toml Co-authored-by: Yuki Okushi --- Cargo.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index aecc4bc9..f956e3a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,5 +66,6 @@ exclude = [ ] [patch.crates-io] -fluent-templates = { git = "https://github.com/XAMPPRocky/fluent-templates.git"} -fluent-template-macros = { git = "https://github.com/XAMPPRocky/fluent-templates.git"} +# FIXME: Specify commit until https://github.com/XAMPPRocky/fluent-templates/pull/36 is released +fluent-templates = { git = "https://github.com/XAMPPRocky/fluent-templates.git", rev = "82b50baf6232e1ce2e9629ce2a8fcc12ab5d942c" } +fluent-template-macros = { git = "https://github.com/XAMPPRocky/fluent-templates.git", rev = "82b50baf6232e1ce2e9629ce2a8fcc12ab5d942c" }