From ffa1bc2a7a345092ced850fdf8f777f9fdcd6301 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Mon, 3 Jan 2022 23:20:42 -0500 Subject: [PATCH] texlab: update to 3.3.1 --- srcpkgs/texlab/patches/jsonrpc.patch | 50 --------- srcpkgs/texlab/patches/salsa.patch | 151 --------------------------- srcpkgs/texlab/template | 13 +-- 3 files changed, 4 insertions(+), 210 deletions(-) delete mode 100644 srcpkgs/texlab/patches/jsonrpc.patch delete mode 100644 srcpkgs/texlab/patches/salsa.patch diff --git a/srcpkgs/texlab/patches/jsonrpc.patch b/srcpkgs/texlab/patches/jsonrpc.patch deleted file mode 100644 index d0fef876ba..0000000000 --- a/srcpkgs/texlab/patches/jsonrpc.patch +++ /dev/null @@ -1,50 +0,0 @@ -commit 62d3567c42de318da828149759c6bb2f71c13de7 -Author: q66 -Date: Wed Mar 10 22:52:10 2021 +0100 - - fix AtomicU64 in jsonrpc (breaks build on ppc32) - -diff --git crates/jsonrpc/src/client.rs crates/jsonrpc/src/client.rs -index 7d71428..3245e24 100644 ---- a/crates/jsonrpc/src/client.rs -+++ b/crates/jsonrpc/src/client.rs -@@ -7,7 +7,7 @@ use futures::{ - }; - use serde::Serialize; - use serde_json::json; --use std::sync::atomic::{AtomicU64, Ordering}; -+use std::sync::atomic::{AtomicUsize, Ordering}; - - pub type Result = std::result::Result; - -@@ -19,7 +19,7 @@ pub trait ResponseHandler { - #[derive(Debug)] - pub struct Client { - output: mpsc::Sender, -- request_id: AtomicU64, -+ request_id: AtomicUsize, - senders_by_id: CHashMap>>, - } - -@@ -27,7 +27,7 @@ impl Client { - pub fn new(output: mpsc::Sender) -> Self { - Self { - output, -- request_id: AtomicU64::new(0), -+ request_id: AtomicUsize::new(0), - senders_by_id: CHashMap::new(), - } - } -diff --git crates/jsonrpc/src/types.rs crates/jsonrpc/src/types.rs -index 30036d1..c1a2dce 100644 ---- a/crates/jsonrpc/src/types.rs -+++ b/crates/jsonrpc/src/types.rs -@@ -6,7 +6,7 @@ pub const PROTOCOL_VERSION: &str = "2.0"; - #[derive(Debug, Eq, Hash, PartialEq, Clone, Deserialize, Serialize)] - #[serde(untagged)] - pub enum Id { -- Number(u64), -+ Number(usize), - String(String), - } - diff --git a/srcpkgs/texlab/patches/salsa.patch b/srcpkgs/texlab/patches/salsa.patch deleted file mode 100644 index 2162599940..0000000000 --- a/srcpkgs/texlab/patches/salsa.patch +++ /dev/null @@ -1,151 +0,0 @@ -commit e038bc231ad881a82fcec028ed307f8d007d8ae5 -Author: Daniel Kolesa -Date: Wed Mar 10 22:31:07 2021 +0100 - - fix on ppc32 (missing atomic64) - - see https://github.com/salsa-rs/salsa/commit/9c7ac99 - -diff --git salsa/src/revision.rs salsa/src/revision.rs -index ca7bb10..a18b581 100644 ---- a/salsa/src/revision.rs -+++ b/salsa/src/revision.rs -@@ -1,9 +1,9 @@ --use std::num::NonZeroU64; --use std::sync::atomic::{AtomicU64, Ordering}; -+use std::num::NonZeroUsize; -+use std::sync::atomic::{AtomicUsize, Ordering}; - - /// Value of the initial revision, as a u64. We don't use 0 --/// because we want to use a `NonZeroU64`. --const START_U64: u64 = 1; -+/// because we want to use a `NonZeroUsize`. -+const START: usize = 1; - - /// A unique identifier for the current version of the database; each - /// time an input is changed, the revision number is incremented. -@@ -12,17 +12,17 @@ const START_U64: u64 = 1; - /// directly as a user of salsa. - #[derive(Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)] - pub struct Revision { -- generation: NonZeroU64, -+ generation: NonZeroUsize, - } - - impl Revision { - pub(crate) fn start() -> Self { -- Self::from(START_U64) -+ Self::from(START) - } - -- pub(crate) fn from(g: u64) -> Self { -+ pub(crate) fn from(g: usize) -> Self { - Self { -- generation: NonZeroU64::new(g).unwrap(), -+ generation: NonZeroUsize::new(g).unwrap(), - } - } - -@@ -30,7 +30,7 @@ impl Revision { - Self::from(self.generation.get() + 1) - } - -- fn as_u64(self) -> u64 { -+ fn as_usize(self) -> usize { - self.generation.get() - } - } -@@ -43,13 +43,13 @@ impl std::fmt::Debug for Revision { - - #[derive(Debug)] - pub(crate) struct AtomicRevision { -- data: AtomicU64, -+ data: AtomicUsize, - } - - impl AtomicRevision { - pub(crate) fn start() -> Self { - Self { -- data: AtomicU64::new(START_U64), -+ data: AtomicUsize::new(START), - } - } - -@@ -58,13 +58,13 @@ impl AtomicRevision { - } - - pub(crate) fn store(&self, r: Revision) { -- self.data.store(r.as_u64(), Ordering::SeqCst); -+ self.data.store(r.as_usize(), Ordering::SeqCst); - } - - /// Increment by 1, returning previous value. - pub(crate) fn fetch_then_increment(&self) -> Revision { - let v = self.data.fetch_add(1, Ordering::SeqCst); -- assert!(v != u64::max_value(), "revision overflow"); -+ assert!(v != usize::max_value(), "revision overflow"); - Revision::from(v) - } - } -diff --git salsa/src/runtime.rs salsa/src/runtime.rs -index 181a5ea..ada5fec 100644 ---- a/salsa/src/runtime.rs -+++ b/salsa/src/runtime.rs -@@ -10,7 +10,7 @@ use parking_lot::{Mutex, RwLock}; - use rustc_hash::{FxHashMap, FxHasher}; - use smallvec::SmallVec; - use std::hash::{BuildHasherDefault, Hash}; --use std::sync::atomic::{AtomicU64, Ordering}; -+use std::sync::atomic::{AtomicUsize, Ordering}; - use std::sync::Arc; - - pub(crate) type FxIndexSet = indexmap::IndexSet>; -@@ -558,14 +558,14 @@ struct SharedState { - storage: DB::DatabaseStorage, - - /// Stores the next id to use for a snapshotted runtime (starts at 1). -- next_id: AtomicU64, -+ next_id: AtomicUsize, - - /// Whenever derived queries are executing, they acquire this lock - /// in read mode. Mutating inputs (and thus creating a new - /// revision) requires a write lock (thus guaranteeing that no - /// derived queries are in progress). Note that this is not needed - /// to prevent **race conditions** -- the revision counter itself -- /// is stored in an `AtomicU64` so it can be cheaply read -+ /// is stored in an `AtomicUsize` so it can be cheaply read - /// without acquiring the lock. Rather, the `query_lock` is used - /// to ensure a higher-level consistency property. - query_lock: RwLock<()>, -@@ -594,7 +594,7 @@ struct SharedState { - impl SharedState { - fn with_durabilities(durabilities: usize) -> Self { - SharedState { -- next_id: AtomicU64::new(1), -+ next_id: AtomicUsize::new(1), - storage: Default::default(), - query_lock: Default::default(), - revisions: (0..durabilities).map(|_| AtomicRevision::start()).collect(), -@@ -715,7 +715,7 @@ impl ActiveQuery { - /// complete, its `RuntimeId` may potentially be re-used. - #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] - pub struct RuntimeId { -- counter: u64, -+ counter: usize, - } - - #[derive(Clone, Debug)] -diff --git Cargo.toml Cargo.toml -index 0847f06..7c4bb9a 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -106,6 +106,9 @@ lalrpop = { version = "0.18", optional = true } - [profile.release] - lto = true - -+[patch.crates-io] -+salsa = { path = './salsa' } -+ - [[bench]] - name = "bench_main" - harness = false diff --git a/srcpkgs/texlab/template b/srcpkgs/texlab/template index c61ac718f0..e50174bdef 100644 --- a/srcpkgs/texlab/template +++ b/srcpkgs/texlab/template @@ -1,17 +1,12 @@ # Template file for 'texlab' pkgname=texlab -version=2.2.2 +version=3.3.1 revision=1 build_style=cargo short_desc="Implementation of the Language Server Protocol for LaTeX" maintainer="Gabriel Sanches " license="GPL-3.0-or-later" homepage="https://texlab.netlify.app/" -distfiles="https://github.com/latex-lsp/${pkgname}/archive/v${version}.tar.gz - https://github.com/salsa-rs/salsa/archive/v0.13.2.tar.gz" -checksum="04978b118b455607b5debd0a886f0728ca6c498289d2a0c60d8f83b316dc5ebc - 2e33e20d22692f6bcd4d638392b9c2cfb716bcd28998e809db0dd88be4f70a31" - -post_extract() { - mv ../salsa-* salsa -} +changelog="https://raw.githubusercontent.com/latex-lsp/texlab/master/CHANGELOG.md" +distfiles="https://github.com/latex-lsp/${pkgname}/archive/v${version}.tar.gz" +checksum="a39766f497dfb2cf9e370ddc430b7d275cb055b4d8a0751d718a86072747a75c"