Merge branch 'main' into hips

Author: danbugs

.devcontainer/Dockerfile

@@ -59,5 +59,6 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
     && rustup target add x86_64-unknown-linux-gnu \
     && rustup target add x86_64-unknown-none      \
     && rustup target add x86_64-pc-windows-msvc   \
+    && rustup toolchain add nightly-x86_64-unknown-linux-gnu \
     && cargo install just
 

.devcontainer/devcontainer.json

@@ -27,7 +27,12 @@
         "ms-vscode.cmake-tools",
         "rust-lang.rust-analyzer",
         "vadimcn.vscode-lldb"
-      ]
+      ],
+      "settings": {
+        "rust-analyzer.rustfmt.extraArgs": [
+          "+nightly" // required for rustfmt.toml which uses nightly features
+        ]
+      }
     }
   }
 }

.gitignore

@@ -448,19 +448,11 @@ $RECYCLE.BIN/
 ## Visual Studio Code
 ##
 .vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
 
 /downloads
 
 # Rust build artifacts
 **/**target
-**/Cargo.lock
-!src/tests/rust_guests/callbackguest/Cargo.lock
-!src/tests/rust_guests/simpleguest/Cargo.lock
-!src/tests/rust_guests/dummyguest/Cargo.lock
 libhyperlight_host.so
 libhyperlight_host.d
 hyperlight_host.dll

.vscode/launch.json

@@ -38,6 +38,7 @@ All contributions come through pull requests. To submit a proposed change, we re
 #### Use work-in-progress PRs for early feedback
 
 A good way to communicate before investing too much time is to create a "Work-in-progress" PR and share it with your reviewers. The standard way of doing this is to add a "[WIP]" prefix in your PR's title and open the pull request as a draft.
+
 ### Developer Certificate of Origin: Signing your work
 
 #### Every commit needs to be signed
@@ -82,3 +83,7 @@ git push --force-with-lease <remote-name> <branch-name>
 ```
 
 *Credit: This doc was cribbed from Dapr.*
+
+### Rust Analyzer
+
+If you are using the [Rust Analyzer](https://rust-analyzer.github.io/manual.html) then you may need to set the configuration option `rust-analyzer.rustfmt.extraArgs` to `["+nightly"]` to ensure that formatting works correctly as this project has a [`rustfmt.toml`](./rustfmt.toml) file that uses nightly features.