From 5cef5a316e1292404857e19947ada7aa5035cd19 Mon Sep 17 00:00:00 2001 From: Nathan Waltz Date: Sat, 11 Mar 2023 21:16:49 +0000 Subject: [PATCH 1/2] Updated devcontainer.json syntax and such. --- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 80 ++++++++++++++++++--------------- README.md | 2 +- alpine.Dockerfile | 2 +- debian.Dockerfile | 2 +- 5 files changed, 48 insertions(+), 40 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 6b5acec..71dd5b4 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1 +1 @@ -FROM qmcgaw/rustdevcontainer +FROM qmcgaw/rustdevcontainer \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 404af88..1e2317a 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,44 +1,52 @@ { "name": "project-dev", - "dockerComposeFile": ["docker-compose.yml"], + "dockerComposeFile": [ + "docker-compose.yml" + ], "service": "vscode", - "runServices": ["vscode"], + "runServices": [ + "vscode" + ], "shutdownAction": "stopCompose", "postCreateCommand": "~/.windows.sh", "workspaceFolder": "/workspace", // "overrideCommand": "", - "extensions": [ - "rust-lang.rust-analyzer", - "tamasfe.even-better-toml", // for Cargo.toml - "eamodio.gitlens", // IDE Git information - "davidanson.vscode-markdownlint", - "ms-azuretools.vscode-docker", // Docker integration and linting - "shardulm94.trailing-spaces", // Show trailing spaces - "Gruntfuggly.todo-tree", // Highlights TODO comments - "bierner.emojisense", // Emoji sense for markdown - "stkb.rewrap", // rewrap comments after n characters on one line - "vscode-icons-team.vscode-icons", // Better file extension icons - "github.vscode-pull-request-github", // Github interaction - "redhat.vscode-yaml", // Kubernetes, Drone syntax highlighting - "bajdzis.vscode-database", // Supports connections to mysql or postgres, over SSL, socked - "IBM.output-colorizer", // Colorize your output/test logs - // "mohsen1.prettify-json", // Prettify JSON data - // "zxh404.vscode-proto3", // Supports Proto syntax - // "jrebocho.vscode-random", // Generates random values - // "alefragnani.Bookmarks", // Manage bookmarks - // "quicktype.quicktype", // Paste JSON as code - // "spikespaz.vscode-smoothtype", // smooth cursor animation - ], - "settings": { - "files.eol": "\n", - "[rust]": { - "editor.defaultFormatter": "rust-lang.rust-analyzer", - "editor.formatOnSave": true - }, - "remote.extensionKind": { - "ms-azuretools.vscode-docker": "workspace" - }, - "editor.codeActionsOnSaveTimeout": 3000, - "rust-analyzer.serverPath": "/usr/local/bin/rust-analyzer" + "customizations": { + "vscode": { + "settings": { + "files.eol": "\n", + "[rust]": { + "editor.defaultFormatter": "rust-lang.rust-analyzer", + "editor.formatOnSave": true + }, + "remote.extensionKind": { + "ms-azuretools.vscode-docker": "workspace" + }, + "editor.codeActionsOnSaveTimeout": 3000, + "rust-analyzer.serverPath": "/usr/local/bin/rust-analyzer" + }, + "extensions": [ + "rust-lang.rust-analyzer", + "tamasfe.even-better-toml", // for Cargo.toml + "eamodio.gitlens", // IDE Git information + "davidanson.vscode-markdownlint", + "ms-azuretools.vscode-docker", // Docker integration and linting + "shardulm94.trailing-spaces", // Show trailing spaces + "Gruntfuggly.todo-tree", // Highlights TODO comments + "bierner.emojisense", // Emoji sense for markdown + "stkb.rewrap", // rewrap comments after n characters on one line + "vscode-icons-team.vscode-icons", // Better file extension icons + "github.vscode-pull-request-github", // Github interaction + "redhat.vscode-yaml", // Kubernetes, Drone syntax highlighting + "bajdzis.vscode-database", // Supports connections to mysql or postgres, over SSL, socked + "IBM.output-colorizer", // Colorize your output/test logs + "mohsen1.prettify-json", // Prettify JSON data + // "zxh404.vscode-proto3", // Supports Proto syntax + "jrebocho.vscode-random", // Generates random values + // "alefragnani.Bookmarks", // Manage bookmarks + "quicktype.quicktype", // Paste JSON as code + "spikespaz.vscode-smoothtype" // smooth cursor animation + ] + } } -} \ No newline at end of file +} diff --git a/README.md b/README.md index 48cafb6..dda07d8 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Rust development container for Visual Studio Code ## Features - Rust 1.66.0 -- Rust Analyzer 2022-10-31 +- Rust Analyzer 2023-01-02 - Clippy - Rustfmt - Alpine based with Docker tags `:latest` and `:alpine` diff --git a/alpine.Dockerfile b/alpine.Dockerfile index 58d9716..7a28729 100644 --- a/alpine.Dockerfile +++ b/alpine.Dockerfile @@ -48,7 +48,7 @@ RUN apk add --no-cache gcc && \ RUN apk add --no-cache musl-dev # Install Rust tooling -ARG RUST_ANALYZER_VERSION=2022-10-31 +ARG RUST_ANALYZER_VERSION=2023-01-02 RUN wget -qO- "https://github.com/rust-analyzer/rust-analyzer/releases/download/${RUST_ANALYZER_VERSION}/rust-analyzer-$(uname -m)-unknown-linux-musl.gz" | \ gunzip > /usr/local/bin/rust-analyzer && \ chmod 500 /usr/local/bin/rust-analyzer diff --git a/debian.Dockerfile b/debian.Dockerfile index 5c2520d..6569433 100644 --- a/debian.Dockerfile +++ b/debian.Dockerfile @@ -56,7 +56,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Install Rust tooling -ARG RUST_ANALYZER_VERSION=2022-10-31 +ARG RUST_ANALYZER_VERSION=2023-01-02 RUN wget -qO- "https://github.com/rust-analyzer/rust-analyzer/releases/download/${RUST_ANALYZER_VERSION}/rust-analyzer-$(uname -m)-unknown-linux-gnu.gz" | \ gunzip > /usr/local/bin/rust-analyzer && \ chmod 500 /usr/local/bin/rust-analyzer From 26e029f7ee21edc39d769c9b1a539fa68fcc5100 Mon Sep 17 00:00:00 2001 From: Nathan Waltz Date: Sat, 11 Mar 2023 21:26:00 +0000 Subject: [PATCH 2/2] Made changes minimal --- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 71dd5b4..6b5acec 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1 +1 @@ -FROM qmcgaw/rustdevcontainer \ No newline at end of file +FROM qmcgaw/rustdevcontainer diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 1e2317a..7eb6927 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -38,14 +38,14 @@ "vscode-icons-team.vscode-icons", // Better file extension icons "github.vscode-pull-request-github", // Github interaction "redhat.vscode-yaml", // Kubernetes, Drone syntax highlighting - "bajdzis.vscode-database", // Supports connections to mysql or postgres, over SSL, socked - "IBM.output-colorizer", // Colorize your output/test logs - "mohsen1.prettify-json", // Prettify JSON data + "bajdzis.vscode-database" // Supports connections to mysql or postgres, over SSL, socked + // "IBM.output-colorizer", // Colorize your output/test logs + // "mohsen1.prettify-json", // Prettify JSON data // "zxh404.vscode-proto3", // Supports Proto syntax - "jrebocho.vscode-random", // Generates random values + // "jrebocho.vscode-random", // Generates random values // "alefragnani.Bookmarks", // Manage bookmarks - "quicktype.quicktype", // Paste JSON as code - "spikespaz.vscode-smoothtype" // smooth cursor animation + // "quicktype.quicktype", // Paste JSON as code + // "spikespaz.vscode-smoothtype" // smooth cursor animation ] } }