update rust std to 1.56.1

.github/workflows/ci.yml

@@ -40,7 +40,9 @@ jobs:
           source environment &&
           make optee &&
           . ~/.cargo/env &&
-          rustup default nightly-2019-07-08 &&
+          rustup component add rust-src && 
+          rustup target install aarch64-unknown-linux-gnu arm-unknown-linux-gnueabihf &&
+          rustup default nightly-2021-09-20 &&
           make examples
       - name: Run tests and examples
         run: |
@@ -63,7 +65,9 @@ jobs:
           source environment &&
           make optee &&
           . ~/.cargo/env &&
-          rustup default nightly-2019-07-08 &&
+          rustup component add rust-src &&
+          rustup target install aarch64-unknown-linux-gnu arm-unknown-linux-gnueabihf &&
+          rustup default nightly-2021-09-20 &&
           (cd optee-utee && xargo build --target aarch64-unknown-optee-trustzone -vv) &&
           (cd optee-teec && cargo build --target aarch64-unknown-linux-gnu -vv)
   build-and-run-examples-in-OPTEE-repo:
@@ -81,6 +85,7 @@ jobs:
       - name: Build images and run tests
         run: |
           cd optee-qemuv8
+          apt-get install pip -y && pip install cryptography
           cd build &&
           make -j2 toolchains &&
           make CFG_TEE_CORE_LOG_LEVEL=0 OPTEE_RUST_ENABLE=y CFG_TEE_RAM_VA_SIZE=0x00300000 -j$(getconf _NPROCESSORS_ONLN) check-rust

.gitmodules

@@ -9,13 +9,13 @@
 	url = https://github.com/OP-TEE/optee_client.git
 [submodule "rust/rust"]
 	path = rust/rust
-	url = https://github.com/mesalock-linux/rust.git
-	branch = optee-trustzone
+	url = https://github.com/RMheng/rust.git
+	branch = update_v1.56.1-new
 [submodule "rust/libc"]
 	path = rust/libc
-	url = https://github.com/mesalock-linux/libc.git
-	branch = optee-trustzone
+	url = https://github.com/RMheng/libc.git
+	branch = update_v0.2.99
 [submodule "rust/compiler-builtins"]
 	path = rust/compiler-builtins
-	url = https://github.com/mesalock-linux/compiler-builtins.git
-	branch = optee-trustzone
+	url = https://github.com/RMheng/compiler-builtins.git
+	branch = update_v0.1.44

Dockerfile

@@ -85,10 +85,10 @@ RUN apt-get install -y software-properties-common && \
 # Install Rust
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \
   . $HOME/.cargo/env && \
-  rustup default nightly-2019-07-08 && \
+  rustup default nightly-2021-09-20 && \
   rustup component add rust-src && \
   rustup target install aarch64-unknown-linux-gnu && \
   rustup default 1.44.0 && cargo +1.44.0 install xargo && \
-  rustup default nightly-2019-07-08
+  rustup default nightly-2021-09-20
 
 ENV PATH="/root/.cargo/bin:$PATH"

examples/acipher-rs/ta/Xargo.toml

@@ -16,10 +16,10 @@
 # under the License.
 
 [dependencies.std]
-path = "../../../rust/rust/src/libstd"
+path = "../../../rust/rust/library/std"
 
 [patch.crates-io]
 libc =  { path = "../../../rust/libc" }
 compiler_builtins =  { path = "../../../rust/compiler-builtins" }
-rustc-std-workspace-core = { path = "../../../rust/rust/src/tools/rustc-std-workspace-core" }
-rustc-std-workspace-alloc = { path = "../../../rust/rust/src/tools/rustc-std-workspace-alloc" }
+rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" }
+rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" }

examples/aes-rs/ta/Xargo.toml

@@ -16,10 +16,10 @@
 # under the License.
 
 [dependencies.std]
-path = "../../../rust/rust/src/libstd"
+path = "../../../rust/rust/library/std"
 
 [patch.crates-io]
 libc =  { path = "../../../rust/libc" }
 compiler_builtins =  { path = "../../../rust/compiler-builtins" }
-rustc-std-workspace-core = { path = "../../../rust/rust/src/tools/rustc-std-workspace-core" }
-rustc-std-workspace-alloc = { path = "../../../rust/rust/src/tools/rustc-std-workspace-alloc" }
+rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" }
+rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" }