summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2024-08-18 22:24:56 -0400
committerGitHub <noreply@github.com>2024-08-18 22:24:56 -0400
commit28bebce54445f248614eca493cff6b8d3659df40 (patch)
treefd7a5455e3472fa1b4203f29a2789286c456890d
parent5c69b4861b52ab406e73b9cd85c254f0505cb20f (diff)
chore: Rust 1.80.1 (#25089)
-rwxr-xr-x.github/workflows/ci.generate.ts2
-rw-r--r--.github/workflows/ci.yml8
-rw-r--r--cli/args/mod.rs14
-rw-r--r--cli/shared.rs6
-rw-r--r--rust-toolchain.toml2
5 files changed, 12 insertions, 20 deletions
diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts
index e34c04f7d..7e66d9997 100755
--- a/.github/workflows/ci.generate.ts
+++ b/.github/workflows/ci.generate.ts
@@ -5,7 +5,7 @@ import { stringify } from "jsr:@std/yaml@^0.221/stringify";
// Bump this number when you want to purge the cache.
// Note: the tools/release/01_bump_crate_versions.ts script will update this version
// automatically via regex, so ensure that this line maintains this format.
-const cacheVersion = 10;
+const cacheVersion = 11;
const ubuntuX86Runner = "ubuntu-22.04";
const ubuntuX86XlRunner = "ubuntu-22.04-xl";
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7a2d2dff4..f4774a904 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -367,8 +367,8 @@ jobs:
path: |-
~/.cargo/registry/index
~/.cargo/registry/cache
- key: '10-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
- restore-keys: '10-cargo-home-${{ matrix.os }}-${{ matrix.arch }}'
+ key: '11-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
+ restore-keys: '11-cargo-home-${{ matrix.os }}-${{ matrix.arch }}'
if: '!(matrix.skip)'
- name: Restore cache build output (PR)
uses: actions/cache/restore@v4
@@ -381,7 +381,7 @@ jobs:
!./target/*/*.zip
!./target/*/*.tar.gz
key: never_saved
- restore-keys: '10-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
+ restore-keys: '11-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
- name: Apply and update mtime cache
if: '!(matrix.skip) && (!startsWith(github.ref, ''refs/tags/''))'
uses: ./.github/mtime_cache
@@ -670,7 +670,7 @@ jobs:
!./target/*/gn_out
!./target/*/*.zip
!./target/*/*.tar.gz
- key: '10-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
+ key: '11-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
publish-canary:
name: publish canary
runs-on: ubuntu-22.04
diff --git a/cli/args/mod.rs b/cli/args/mod.rs
index c347ab6fd..403e4ffdf 100644
--- a/cli/args/mod.rs
+++ b/cli/args/mod.rs
@@ -1453,16 +1453,6 @@ impl CliOptions {
Ok(result)
}
- pub fn resolve_deno_graph_workspace_members(
- &self,
- ) -> Result<Vec<deno_graph::WorkspaceMember>, AnyError> {
- self
- .workspace()
- .jsr_packages()
- .map(|pkg| config_to_deno_graph_workspace_member(&pkg.config_file))
- .collect::<Result<Vec<_>, _>>()
- }
-
/// Vector of user script CLI arguments.
pub fn argv(&self) -> &Vec<String> {
&self.flags.argv
@@ -1551,10 +1541,6 @@ impl CliOptions {
&self.flags.location
}
- pub fn maybe_custom_root(&self) -> &Option<PathBuf> {
- &self.flags.cache_path
- }
-
pub fn no_remote(&self) -> bool {
self.flags.no_remote
}
diff --git a/cli/shared.rs b/cli/shared.rs
index d02c2762e..808aff707 100644
--- a/cli/shared.rs
+++ b/cli/shared.rs
@@ -7,9 +7,11 @@ use deno_core::error::AnyError;
#[derive(Debug, Clone, Copy, PartialEq)]
pub enum ReleaseChannel {
/// Stable version, eg. 1.45.4, 2.0.0, 2.1.0
+ #[allow(unused)]
Stable,
/// Pointing to a git hash
+ #[allow(unused)]
Canary,
/// Long term support release
@@ -17,10 +19,12 @@ pub enum ReleaseChannel {
Lts,
/// Release candidate, eg. 1.46.0-rc.0, 2.0.0-rc.1
+ #[allow(unused)]
Rc,
}
impl ReleaseChannel {
+ #[allow(unused)]
pub fn name(&self) -> &str {
match self {
Self::Stable => "stable",
@@ -32,6 +36,7 @@ impl ReleaseChannel {
// NOTE(bartlomieju): do not ever change these values, tools like `patchver`
// rely on them.
+ #[allow(unused)]
pub fn serialize(&self) -> String {
match self {
Self::Stable => "stable",
@@ -44,6 +49,7 @@ impl ReleaseChannel {
// NOTE(bartlomieju): do not ever change these values, tools like `patchver`
// rely on them.
+ #[allow(unused)]
pub fn deserialize(str_: &str) -> Result<Self, AnyError> {
Ok(match str_ {
"stable" => Self::Stable,
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 85cb9e7bb..e8d3cddd1 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
[toolchain]
-channel = "1.80.0"
+channel = "1.80.1"
components = ["rustfmt", "clippy"]