macaroon: trunk -> main

Cargo.lock

@@ -1433,10 +1433,10 @@ dependencies = [
 
 [[package]]
 name = "macaroon"
-version = "0.1.1"
+version = "0.2.0"
-source = "git+https://github.com/macaroon-rs/macaroon.git?branch=trunk#74cc7b50c04fcd2ca468d28d6bc9a155f26fa047"
+source = "git+https://github.com/macaroon-rs/macaroon.git?branch=main#6015828846f11251248fcdd717e015c33bab8b70"
 dependencies = [
- "base64 0.12.3",
+ "base64 0.13.0",
  "log",
  "serde",
  "serde_json",

Cargo.toml

@@ -36,7 +36,7 @@ bytes = "1.1.0"
 http = "0.2.4"
 # Used to find data directory for default db path
 directories = "3.0.2"
-macaroon = { git = "https://github.com/macaroon-rs/macaroon.git", branch = "trunk" }
+macaroon = { git = "https://github.com/macaroon-rs/macaroon.git", branch = "main" }
 openid = "0.9"
 # Used for ruma wrapper
 serde_json = { version = "1.0.67", features = ["raw_value"] }