From bf57cda661572480081cfc0828ff3fad6fd83869 Mon Sep 17 00:00:00 2001 From: William Lanchantin Date: Fri, 2 Feb 2024 11:44:43 -0500 Subject: [PATCH 1/6] add symlink --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) create mode 120000 Cargo.toml diff --git a/Cargo.toml b/Cargo.toml new file mode 120000 index 000000000..c57bb4dc9 --- /dev/null +++ b/Cargo.toml @@ -0,0 +1 @@ +native/explorer/Cargo.toml \ No newline at end of file From 76fc18056b0297618beb1b5537c00b0c77491295 Mon Sep 17 00:00:00 2001 From: William Lanchantin Date: Fri, 2 Feb 2024 11:44:50 -0500 Subject: [PATCH 2/6] ignore artifacts --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 39a048f6d..62a3dab34 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,9 @@ explorer-*.tar .nix-mix .nix-hex .direnv + +# Accommodate VSCode users with the rust-analyzer extension. +# They need a symlink to `native/explorer/Cargo.toml` in the root directory. +# When the symlink is present, rust-analyzer creates these artifacts: +Cargo.lock +target/ \ No newline at end of file From 7ccfa108cee3a32709a1b9a29017be60218af1c2 Mon Sep 17 00:00:00 2001 From: William Lanchantin Date: Fri, 2 Feb 2024 12:17:24 -0500 Subject: [PATCH 3/6] settings.json works way better https://github.com/rust-lang/rust-analyzer/issues/6007#issuecomment-1295801479 --- .gitignore | 8 +------- .vscode/settings.json | 5 +++++ Cargo.toml | 1 - 3 files changed, 6 insertions(+), 8 deletions(-) create mode 100644 .vscode/settings.json delete mode 120000 Cargo.toml diff --git a/.gitignore b/.gitignore index 62a3dab34..8235a8b47 100644 --- a/.gitignore +++ b/.gitignore @@ -46,10 +46,4 @@ explorer-*.tar # Accommodate Nix folks .nix-mix .nix-hex -.direnv - -# Accommodate VSCode users with the rust-analyzer extension. -# They need a symlink to `native/explorer/Cargo.toml` in the root directory. -# When the symlink is present, rust-analyzer creates these artifacts: -Cargo.lock -target/ \ No newline at end of file +.direnv \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..d43442e40 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "rust-analyzer.linkedProjects": [ + "native/explorer/Cargo.toml" + ] +} \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml deleted file mode 120000 index c57bb4dc9..000000000 --- a/Cargo.toml +++ /dev/null @@ -1 +0,0 @@ -native/explorer/Cargo.toml \ No newline at end of file From b16731d1dd3cb4b0e8b4e97950025c5a7f0ca0fa Mon Sep 17 00:00:00 2001 From: William Lanchantin Date: Fri, 2 Feb 2024 12:22:42 -0500 Subject: [PATCH 4/6] fix EOF (hopefully) --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8235a8b47..39a048f6d 100644 --- a/.gitignore +++ b/.gitignore @@ -46,4 +46,4 @@ explorer-*.tar # Accommodate Nix folks .nix-mix .nix-hex -.direnv \ No newline at end of file +.direnv From db993945718817ae542669f3afe4807556817510 Mon Sep 17 00:00:00 2001 From: William Lanchantin Date: Fri, 2 Feb 2024 12:41:57 -0500 Subject: [PATCH 5/6] fix another EOF --- .vscode/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index d43442e40..887aee9af 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,4 +2,4 @@ "rust-analyzer.linkedProjects": [ "native/explorer/Cargo.toml" ] -} \ No newline at end of file +} From a5851db3b1315b826364ceec028f1183038cd4e4 Mon Sep 17 00:00:00 2001 From: William Lanchantin Date: Fri, 2 Feb 2024 12:42:09 -0500 Subject: [PATCH 6/6] mention some recommended extensions --- .vscode/extensions.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .vscode/extensions.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 000000000..72b00f245 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,6 @@ +{ + "recommendations": [ + "EditorConfig.EditorConfig", + "rust-lang.rust-analyzer" + ] +}