Skip to content

fix(rust): remove rls and rust-analysis for Rust 1.87+ compatibility #1362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/rust/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "rust",
"version": "1.3.2",
"version": "1.3.3",
"name": "Rust",
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
"description": "Installs Rust, common Rust utilities, and their required dependencies",
Expand All @@ -10,6 +10,14 @@
"proposals": [
"latest",
"none",
"1.87",
"1.86",
"1.85",
"1.84",
"1.83",
"1.82",
"1.81",
"1.80",
"1.79",
"1.78",
"1.77",
Expand All @@ -25,10 +33,7 @@
"1.67",
"1.66",
"1.65",
"1.64",
"1.63",
"1.62",
"1.61"
"1.64"
],
"default": "latest",
"description": "Select or enter a version of Rust to install."
Expand Down
2 changes: 1 addition & 1 deletion src/rust/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ if [ "${UPDATE_RUST}" = "true" ]; then
rustup update 2>&1
fi
echo "Installing common Rust dependencies..."
rustup component add rls rust-analysis rust-src rustfmt clippy 2>&1
rustup component add rust-analyzer rust-src rustfmt clippy 2>&1

if [ -n "${RUSTUP_TARGETS}" ]; then
IFS=',' read -ra targets <<< "${RUSTUP_TARGETS}"
Expand Down
2 changes: 1 addition & 1 deletion test/rust/rust_at_pinned_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ source dev-container-features-test-lib
# Definition specific tests
check "cargo version" cargo --version
check "rustc version" rustc --version
check "correct rust version" rustc --version | grep 1.62.0
check "correct rust version" rustc --version | grep 1.64.0


# Report result
Expand Down
2 changes: 1 addition & 1 deletion test/rust/scenarios.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"image": "ubuntu:focal",
"features": {
"rust": {
"version": "1.62.0"
"version": "1.64.0"
}
}
},
Expand Down