Merge pull request #1234 from getsops/update-rustc

Update rustc functional tests to v1.70.0

.github/workflows/cli.yml

@@ -73,7 +73,7 @@ jobs:
       VAULT_ADDR: "http://127.0.0.1:8200"
     steps:
       - name: Install rustup
-        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y --default-toolchain 1.47.0
+        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y --default-toolchain 1.70.0
       - name: Check out code
         uses: actions/checkout@v2
       - uses: actions/download-artifact@v2

functional-tests/Cargo.toml

@@ -1,12 +1,13 @@
 [package]
 name = "functional-tests"
 version = "0.1.0"
+edition = "2021"
 authors = ["Adrian Utrilla <adrianutrilla@gmail.com>"]
 
 [dependencies]
 tempdir = "0.3.5"
 serde = "1.0"
-serde_json = "0.8"
-serde_yaml = "0.5"
+serde_json = "1.0.99"
+serde_yaml = "0.9.22"
 serde_derive = "1.0"
-lazy_static = "0.1.*"
+lazy_static = "1.4.0"

functional-tests/src/lib.rs

@@ -624,7 +624,7 @@ b: ba"#
         assert!(output.status
                     .success(),
                 "SOPS failed to decrypt a binary file");
-        assert_eq!(output.stdout, &[]);
+        assert_eq!(output.stdout, <&[u8]>::default());
         let mut f = File::open(&output_path).expect("output file not found");
 
         let mut contents = String::new();