mirror of
https://github.com/denoland/deno.git
synced 2024-11-21 15:04:11 -05:00
chore: upgrade to rust 1.81.0 (#26261)
This commit is contained in:
parent
e4b52f5a76
commit
533a9b1086
8 changed files with 17 additions and 17 deletions
2
.github/workflows/ci.generate.ts
vendored
2
.github/workflows/ci.generate.ts
vendored
|
@ -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 = 18;
|
||||
const cacheVersion = 19;
|
||||
|
||||
const ubuntuX86Runner = "ubuntu-22.04";
|
||||
const ubuntuX86XlRunner = "ubuntu-22.04-xl";
|
||||
|
|
8
.github/workflows/ci.yml
vendored
8
.github/workflows/ci.yml
vendored
|
@ -361,8 +361,8 @@ jobs:
|
|||
path: |-
|
||||
~/.cargo/registry/index
|
||||
~/.cargo/registry/cache
|
||||
key: '18-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
|
||||
restore-keys: '18-cargo-home-${{ matrix.os }}-${{ matrix.arch }}'
|
||||
key: '19-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
|
||||
restore-keys: '19-cargo-home-${{ matrix.os }}-${{ matrix.arch }}'
|
||||
if: '!(matrix.skip)'
|
||||
- name: Restore cache build output (PR)
|
||||
uses: actions/cache/restore@v4
|
||||
|
@ -375,7 +375,7 @@ jobs:
|
|||
!./target/*/*.zip
|
||||
!./target/*/*.tar.gz
|
||||
key: never_saved
|
||||
restore-keys: '18-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
|
||||
restore-keys: '19-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
|
||||
|
@ -685,7 +685,7 @@ jobs:
|
|||
!./target/*/*.zip
|
||||
!./target/*/*.sha256sum
|
||||
!./target/*/*.tar.gz
|
||||
key: '18-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
|
||||
key: '19-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
|
||||
publish-canary:
|
||||
name: publish canary
|
||||
runs-on: ubuntu-22.04
|
||||
|
|
|
@ -3939,7 +3939,7 @@ pub struct OutliningSpan {
|
|||
kind: OutliningSpanKind,
|
||||
}
|
||||
|
||||
const FOLD_END_PAIR_CHARACTERS: &[u8] = &[b'}', b']', b')', b'`'];
|
||||
const FOLD_END_PAIR_CHARACTERS: &[u8] = b"}])`";
|
||||
|
||||
impl OutliningSpan {
|
||||
pub fn to_folding_range(
|
||||
|
|
|
@ -40,7 +40,7 @@ pub fn maybe_auth_header_for_npm_registry(
|
|||
header::AUTHORIZATION,
|
||||
header::HeaderValue::from_str(&format!(
|
||||
"Basic {}",
|
||||
BASE64_STANDARD.encode(&format!(
|
||||
BASE64_STANDARD.encode(format!(
|
||||
"{}:{}",
|
||||
username.unwrap(),
|
||||
password.unwrap()
|
||||
|
|
|
@ -160,10 +160,10 @@ fn atomic_write_file(
|
|||
data: &[u8],
|
||||
) -> std::io::Result<()> {
|
||||
fs.write_file(temp_file_path, data)?;
|
||||
fs.rename_file(temp_file_path, file_path).map_err(|err| {
|
||||
fs.rename_file(temp_file_path, file_path)
|
||||
.inspect_err(|_err| {
|
||||
// clean up the created temp file on error
|
||||
let _ = fs.remove_file(temp_file_path);
|
||||
err
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
@ -366,7 +366,7 @@ impl PermissionPrompter for TtyPrompter {
|
|||
|
||||
let mut input = String::new();
|
||||
let result = stdin_lock.read_line(&mut input);
|
||||
let input = input.trim_end_matches(|c| c == '\r' || c == '\n');
|
||||
let input = input.trim_end_matches(['\r', '\n']);
|
||||
if result.is_err() || input.len() != 1 {
|
||||
break PromptResponse::Deny;
|
||||
};
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
[toolchain]
|
||||
channel = "1.80.1"
|
||||
channel = "1.81.0"
|
||||
components = ["rustfmt", "clippy"]
|
||||
|
|
|
@ -241,7 +241,7 @@ fn compile_with_file_exists_error() {
|
|||
"./compile/args.ts",
|
||||
])
|
||||
.run()
|
||||
.assert_matches_text(&format!(
|
||||
.assert_matches_text(format!(
|
||||
concat!(
|
||||
"[WILDCARD]error: Could not compile to file '{}' because its parent directory ",
|
||||
"is an existing file. You can use the `--output <file-path>` flag to ",
|
||||
|
@ -269,7 +269,7 @@ fn compile_with_directory_exists_error() {
|
|||
&exe.to_string_lossy(),
|
||||
"./compile/args.ts"
|
||||
]).run()
|
||||
.assert_matches_text(&format!(
|
||||
.assert_matches_text(format!(
|
||||
concat!(
|
||||
"[WILDCARD]error: Could not compile to file '{}' because a directory exists with ",
|
||||
"the same name. You can use the `--output <file-path>` flag to ",
|
||||
|
@ -297,7 +297,7 @@ fn compile_with_conflict_file_exists_error() {
|
|||
&exe.to_string_lossy(),
|
||||
"./compile/args.ts"
|
||||
]).run()
|
||||
.assert_matches_text(&format!(
|
||||
.assert_matches_text(format!(
|
||||
concat!(
|
||||
"[WILDCARD]error: Could not compile to file '{}' because the file already exists ",
|
||||
"and cannot be overwritten. Please delete the existing file or ",
|
||||
|
|
Loading…
Reference in a new issue