Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into day-17
Browse files Browse the repository at this point in the history
  • Loading branch information
kristof-mattei committed Aug 24, 2023
2 parents ea71b2e + 8d448c8 commit fa47f2e
Show file tree
Hide file tree
Showing 38 changed files with 8,450 additions and 240 deletions.
10 changes: 0 additions & 10 deletions .codeclimate.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/vscode/devcontainers/rust:1-bullseye@sha256:81dead6303550d58a600ea309b1b516637c28dc627ec68bc5ee568de91e6936e
FROM mcr.microsoft.com/devcontainers/rust:1-1-bullseye@sha256:cf9b9da4b2b11f204a764ca4f911fbd4a5abe72db70652af00e6343c9eb487bc

# [Optional] Uncomment this section to install additional packages.
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
Expand Down
37 changes: 27 additions & 10 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.195.0/containers/rust
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/rust
{
"name": "Rust",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
// "image": "mcr.microsoft.com/devcontainers/rust:0-1-bullseye",

"build": {
"dockerfile": "Dockerfile",
"args": {
// Use the VARIANT arg to pick a Debian OS version: buster, bullseye
// Use bullseye when on local on arm64/Apple Silicon.
"VARIANT": "bullseye"
// We use full sha256
// "VARIANT": "bullseye"
}
},
"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
"seccomp=unconfined"
],
"runArgs": ["--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],
// Configure tool-specific properties.
"customizations": {
// Configure properties specific to VS Code.
Expand All @@ -25,8 +25,10 @@
// VS Code don't watch files under ./target
"files.watcherExclude": {
"**/target/**": true
}
},
"rust-analyzer.checkOnSave.command": "clippy"
},

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"vadimcn.vscode-lldb",
Expand All @@ -37,10 +39,25 @@
]
}
},

// Use 'mounts' to make the cargo cache persistent in a Docker Volume.
// "mounts": [
// {
// "source": "devcontainer-cargo-cache-${devcontainerId}",
// "target": "/usr/local/cargo",
// "type": "volume"
// }
// ]

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "rustc --version",
// Comment out to run as root instead.

// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode"
}
22 changes: 22 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
root = true

[*]
end_of_line = lf

indent_style = space

insert_final_newline = true
trim_trailing_whitespace = true

charset = utf-8

[*.sh]
indent_size = 4

# shfmt settings
shell_variant = bash # --language-variant
binary_next_line = true
switch_case_indent = true # --case-indent
space_redirects = true
keep_padding = true
function_next_line = true # --func-next-line
2 changes: 1 addition & 1 deletion .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ repository:
# labels:
# - name: bug
# color: CC0000
# description: An issue with the system 🐛.
# description: An issue with the system.
#
# - name: feature
# # If including a `#`, make sure to wrap it with quotes!
Expand Down
Loading

0 comments on commit fa47f2e

Please # to comment.