80337c9066
Pkgsrc changes: * Sadly, I had to reinstate the "make tar files" rust code to make it possible to build cross-compiled bootstrap kits. * Add an adjustable "BUILD_TARGET", "dist" for cross-building a bootstrap kit, "build" for a normal native build. * New bootstrap kits built for NetBSD/powerpc, NetBSD/earmv7hf, and NetBSD/sparc64 version 1.31.1. * gcc-wrap script amended to also drop -Wl,--enable-new-dtags (so it could be used outside pkgsrc) * Worked around use of AtomicU64 in release build tool (ugly band-aid patch). Some platforms lack support for that type and associated operations. Upstream changes: - [Fix Rust failing to build on `powerpc-unknown-netbsd`][56562] - [Fix broken go-to-definition in RLS][rls/1171] - [Fix infinite loop on hover in RLS][rls/1170] [56562]: https://github.com/rust-lang/rust/pull/56562 [rls/1171]: https://github.com/rust-lang/rls/issues/1171 [rls/1170]: https://github.com/rust-lang/rls/pull/1170
24 lines
910 B
Rust
24 lines
910 B
Rust
$NetBSD: patch-src_tools_rls_src_cmd.rs,v 1.1 2018/12/21 23:12:34 he Exp $
|
|
|
|
--- src/tools/rls/src/cmd.rs.orig 2018-12-18 23:12:41.000000000 +0000
|
|
+++ src/tools/rls/src/cmd.rs
|
|
@@ -17,7 +17,7 @@ use crate::config::Config;
|
|
use crate::server::{self, LsService, Notification, Request, RequestId};
|
|
use rls_analysis::{AnalysisHost, Target};
|
|
use rls_vfs::Vfs;
|
|
-use std::sync::atomic::{AtomicU64, Ordering};
|
|
+use std::sync::atomic::{AtomicU32, Ordering};
|
|
|
|
use languageserver_types::{
|
|
ClientCapabilities, CodeActionContext, CodeActionParams, CompletionItem,
|
|
@@ -424,8 +424,8 @@ fn url(file_name: &str) -> Url {
|
|
}
|
|
|
|
fn next_id() -> RequestId {
|
|
- static ID: AtomicU64 = AtomicU64::new(1);
|
|
- RequestId::Num(ID.fetch_add(1, Ordering::SeqCst))
|
|
+ static ID: AtomicU32 = AtomicU32::new(1);
|
|
+ RequestId::Num(ID.fetch_add(1, Ordering::SeqCst) as u64)
|
|
}
|
|
|
|
// Custom reader and output for the RLS server.
|