upgrade Rust to v1.69.0 (pantsbuild#18783)

carbon-re · Apr 23, 2023 · cf806e7 · cf806e7
1 parent 09d09c6
commit cf806e7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/test-cron.yaml b/.github/workflows/test-cron.yaml
@@ -33,7 +33,7 @@ jobs:
       uses: actions/cache@v3
       with:
         key: Linux-ARM64-rustup-${{ hashFiles('rust-toolchain') }}-v2
-        path: '~/.rustup/toolchains/1.68.2-*
+        path: '~/.rustup/toolchains/1.69.0-*
 
           ~/.rustup/update-hashes
 
@@ -134,7 +134,7 @@ jobs:
       uses: actions/cache@v3
       with:
         key: Linux-x86_64-rustup-${{ hashFiles('rust-toolchain') }}-v2
-        path: '~/.rustup/toolchains/1.68.2-*
+        path: '~/.rustup/toolchains/1.69.0-*
 
           ~/.rustup/update-hashes
 
@@ -247,7 +247,7 @@ jobs:
       uses: actions/cache@v3
       with:
         key: macOS11-x86_64-rustup-${{ hashFiles('rust-toolchain') }}-v2
-        path: '~/.rustup/toolchains/1.68.2-*
+        path: '~/.rustup/toolchains/1.69.0-*
 
           ~/.rustup/update-hashes
 

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -37,7 +37,7 @@ jobs:
       uses: actions/cache@v3
       with:
         key: Linux-ARM64-rustup-${{ hashFiles('rust-toolchain') }}-v2
-        path: '~/.rustup/toolchains/1.68.2-*
+        path: '~/.rustup/toolchains/1.69.0-*
 
           ~/.rustup/update-hashes
 
@@ -137,7 +137,7 @@ jobs:
       uses: actions/cache@v3
       with:
         key: Linux-x86_64-rustup-${{ hashFiles('rust-toolchain') }}-v2
-        path: '~/.rustup/toolchains/1.68.2-*
+        path: '~/.rustup/toolchains/1.69.0-*
 
           ~/.rustup/update-hashes
 
@@ -249,7 +249,7 @@ jobs:
       uses: actions/cache@v3
       with:
         key: macOS11-x86_64-rustup-${{ hashFiles('rust-toolchain') }}-v2
-        path: '~/.rustup/toolchains/1.68.2-*
+        path: '~/.rustup/toolchains/1.69.0-*
 
           ~/.rustup/update-hashes
 
@@ -474,7 +474,7 @@ jobs:
       uses: actions/cache@v3
       with:
         key: macOS10-15-x86_64-rustup-${{ hashFiles('rust-toolchain') }}-v2
-        path: '~/.rustup/toolchains/1.68.2-*
+        path: '~/.rustup/toolchains/1.69.0-*
 
           ~/.rustup/update-hashes
 
@@ -542,7 +542,7 @@ jobs:
       uses: actions/cache@v3
       with:
         key: macOS11-ARM64-rustup-${{ hashFiles('rust-toolchain') }}-v2
-        path: '~/.rustup/toolchains/1.68.2-*
+        path: '~/.rustup/toolchains/1.69.0-*
 
           ~/.rustup/update-hashes
 

diff --git a/rust-toolchain b/rust-toolchain
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.68.2"
+channel = "1.69.0"
 components = [
   "cargo",
   "clippy",

diff --git a/src/rust/engine/graph/src/lib.rs b/src/rust/engine/graph/src/lib.rs
@@ -348,11 +348,11 @@ impl<N: Node> InnerGraph<N> {
     Ok(())
   }
 
-  fn live_reachable<'g>(
-    &'g self,
+  fn live_reachable(
+    &self,
     roots: &[N],
     context: &N::Context,
-  ) -> impl Iterator<Item = (&N, N::Item)> + 'g {
+  ) -> impl Iterator<Item = (&N, N::Item)> {
     // TODO: This is a surprisingly expensive method, because it will clone all reachable values by
     // calling `peek` on them.
     let root_ids = roots
@@ -368,7 +368,7 @@ impl<N: Node> InnerGraph<N> {
     )
   }
 
-  fn live<'g>(&'g self, context: &N::Context) -> impl Iterator<Item = (&N, N::Item)> + 'g {
+  fn live(&self, context: &N::Context) -> impl Iterator<Item = (&N, N::Item)> {
     self.live_internal(self.pg.node_indices().collect(), context.clone())
   }