JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #116452 from bkchr/rust-analyzer-15-03-2021

Browse Source 
rust-analyzer: 2021-03-01 -> 2021-03-15
This commit is contained in:
Bernardo Meurer 2021-03-15 19:12:40 +00:00 committed by GitHub
commit a765beccb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1405 additions and 1815 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3198
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

6
pkgs/development/tools/rust/rust-analyzer/default.nix
View File

@ -2,10 +2,10 @@
{
rust-analyzer-unwrapped = callPackage ./generic.nix rec {
rev = "2021-03-01";
rev = "2021-03-15";
version = "unstable-${rev}";
sha256 = "10x4fk1nxk548cfxrbfvz0kpa2r955d0bcnxxn8k8zmrdqxs3sph";
cargoSha256 = "02s6qnq61vifx59hnbaalqmfvp8anfik62y6rzy3rwm1l9r85qrz";
sha256 = "150gydm0mg72bbhgjjks8qc5ldiqyzhai9z4yfh4f1s2bwdfh3yf";
cargoSha256 = "10l0lk5p11002q59dqa5yrrz6n6s11i7bmr1wnl141bxqvm873q2";
};
rust-analyzer = callPackage ./wrapper.nix {} {

2
pkgs/development/tools/rust/rust-analyzer/generic.nix
View File

@ -43,6 +43,8 @@ rustPlatform.buildRustPackage {
passthru.updateScript = ./update.sh;
patches = [ ./rust_1_49.patch ];
meta = with lib; {
description = "An experimental modular compiler frontend for the Rust language";
homepage = "https://github.com/rust-analyzer/rust-analyzer";

13
pkgs/development/tools/rust/rust-analyzer/rust_1_49.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/crates/ide_assists/src/handlers/convert_iter_for_each_to_for.rs b/crates/ide_assists/src/handlers/convert_iter_for_each_to_for.rs
index 4e75a7b14..91f51a1a7 100644
--- a/crates/ide_assists/src/handlers/convert_iter_for_each_to_for.rs
+++ b/crates/ide_assists/src/handlers/convert_iter_for_each_to_for.rs
@@ -93,7 +93,7 @@ fn validate_method_call_expr(
let krate = module.krate();
let iter_trait = FamousDefs(sema, Some(krate)).core_iter_Iterator()?;
- it_type.impls_trait(sema.db, iter_trait, &[]).then(|| (expr, receiver))
+ if it_type.impls_trait(sema.db, iter_trait, &[]) { Some((expr, receiver)) } else { None }
}
#[cfg(test)]

1
pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
View File

@ -2,6 +2,7 @@
"name": "rust-analyzer",
"version": "0.4.0-dev",
"dependencies": {
"https-proxy-agent": "^5.0.0",
"node-fetch": "^2.6.1",
"vscode-languageclient": "^7.1.0-next.4",
"@rollup/plugin-commonjs": "^17.0.0",