diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 00000000..b98e0ea4
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,13 @@
+{
+    "name": "rpl-dev",
+    "image": "mcr.microsoft.com/devcontainers/rust:latest",
+    "remoteUser": "vscode",
+    "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+    "containerEnv": {
+        "SHELL": "/bin/zsh"
+    },
+    "mounts": [
+        "source=cargo-registry,target=/usr/local/cargo/registry,type=volume",
+        "source=cargo-git,target=/usr/local/cargo/git,type=volume"
+    ],
+}
diff --git a/.zed/settings.json b/.zed/settings.json
new file mode 100644
index 00000000..83856260
--- /dev/null
+++ b/.zed/settings.json
@@ -0,0 +1,20 @@
+{
+    "lsp": {
+        "rust-analyzer": {
+            "initialization_options": {
+                "rustc": {
+                    "source": "discover",
+                },
+                "linkedProjects": [
+                    "./Cargo.toml",
+                    "./tests/ui/cross-stmt-and-func-comparison-with-clippy/Cargo.toml",
+                ],
+                "diagnostics": {
+                    "disabled": [
+                        "macro-error"
+                    ],
+                }
+            }
+        }
+    }
+}
diff --git a/rust-toolchain b/rust-toolchain
index 8fd06aaa..ff356cbf 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
 channel = "nightly-2025-02-14"
-components = ["cargo", "llvm-tools", "rust-src", "rust-std", "rustc", "rustc-dev", "rustfmt", "clippy"]
+components = ["cargo", "llvm-tools", "rust-src", "rust-std", "rustc", "rustc-dev", "rustfmt", "clippy", "rust-analyzer"]