From e655ee09ab0222c68fe54db2d51a673c7f76da43 Mon Sep 17 00:00:00 2001
From: Markus Westerlind <mwesterlind@influxdata.com>
Date: Tue, 25 Oct 2022 12:22:07 +0200
Subject: [PATCH 1/2] chore: Remove cross from CI

Seems to be broken now and I don't think I use it.
---
 .github/workflows/rust.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index b9fab22ee..e09749acc 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -37,7 +37,6 @@ jobs:
       if: steps.cache.outputs.cache-hit != 'true'
       run: |
           ./scripts/install_sccache.sh $TARGET
-          sh scripts/install_cross.sh
           source ~/.cargo/env || true
           ./scripts/install_mdbook.sh $TARGET
     - name: Run tests

From f30127bf5e27520d41a654154381c2e9601d2f3e Mon Sep 17 00:00:00 2001
From: Markus Westerlind <mwesterlind@influxdata.com>
Date: Tue, 25 Oct 2022 12:46:08 +0200
Subject: [PATCH 2/2] chore: Fix compilation error on newer rust

---
 src/query.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/query.rs b/src/query.rs
index 2f9f7dadd..5ac30addf 100644
--- a/src/query.rs
+++ b/src/query.rs
@@ -805,7 +805,7 @@ async fn global(
 use std::cell::RefCell;
 pub struct Env<T>(RefCell<T>);
 
-pub(crate) fn env(env: &(dyn Compilation + '_)) -> Env<&'_ CompilerDatabase> {
+pub(crate) fn env<'a>(env: &'a (dyn Compilation + 'a)) -> Env<&'a CompilerDatabase> {
     Env(RefCell::new(env.compiler()))
 }
 pub(crate) fn snapshot_env<T>(env: T) -> Env<T>