Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(cargo): Update rustc to nightly-2024-02-06 #8618

Merged
merged 15 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ jobs:
uses: baptiste0928/cargo-install@v2
with:
crate: cargo-deny
version: "0.14.3"
version: "0.14.11"

- name: Check licenses
run: |
Expand Down
34 changes: 17 additions & 17 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions bindings/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/preset_env_base/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ version = "0.4.11"
bench = false

[dependencies]
ahash = "0.8.5"
ahash = "0.8.8"
anyhow = "1"
browserslist-rs = "0.15.0"
dashmap = "5.4.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/swc_cached/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ version = "0.3.19"
bench = false

[dependencies]
ahash = "0.8.5"
ahash = "0.8.8"
anyhow = "1.0.71"
dashmap = "5.4.0"
once_cell = "1.18.0"
Expand Down
1 change: 0 additions & 1 deletion crates/swc_cli_impl/src/commands/plugin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ fn write_ignore_file(base_path: &Path) -> Result<()> {
};

let mut f = OpenOptions::new()
.write(true)
.append(true)
.create(true)
.open(&ignore_file_path)?;
Expand Down
2 changes: 1 addition & 1 deletion crates/swc_common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ __rkyv = []
rkyv-impl = ["__rkyv", "rkyv", "swc_atoms/rkyv-impl", "bytecheck"]

[dependencies]
ahash = { version = "0.8.5", optional = true }
ahash = { version = "0.8.8", optional = true }
anyhow = { version = "1.0.71", optional = true }
arbitrary = { version = "1", optional = true, features = ["derive"] }
atty = { version = "0.2", optional = true }
Expand Down
5 changes: 3 additions & 2 deletions crates/swc_common/src/source_map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -728,15 +728,16 @@ impl SourceMap {
return sp;
}

match self.span_to_source(sp, |src, start_index, end_index| {
let v = self.span_to_source(sp, |src, start_index, end_index| {
let snippet = &src[start_index..end_index];
let snippet = snippet.split(c).next().unwrap_or("").trim_end();
if !snippet.is_empty() && !snippet.contains('\n') {
sp.with_hi(BytePos(sp.lo().0 + snippet.len() as u32))
} else {
sp
}
}) {
});
match v {
Ok(v) => v,
Err(_) => sp,
}
Expand Down
5 changes: 3 additions & 2 deletions crates/swc_css_parser/src/parser/at_rules/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ where
}
};

match self.parse_according_to_grammar(&locv, |parser| {
let res = self.parse_according_to_grammar(&locv, |parser| {
parser.input.skip_ws();

let child = parser.parse()?;
Expand All @@ -615,7 +615,8 @@ where
}

Ok(keyframes_selectors)
}) {
});
match res {
Ok(keyframes_selectors) => {
ComponentValue::KeyframeBlock(Box::new(KeyframeBlock {
span: qualified_rule.span,
Expand Down
5 changes: 3 additions & 2 deletions crates/swc_css_parser/src/parser/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ where
) -> PResult<Declaration> {
let locv = self.create_locv(declaration.value);

declaration.value = match self.parse_according_to_grammar(&locv, |parser| {
let value = self.parse_according_to_grammar(&locv, |parser| {
let mut values = vec![];

loop {
Expand All @@ -300,7 +300,8 @@ where
}

Ok(values)
}) {
});
declaration.value = match value {
Ok(values) => values,
Err(err) => {
if *err.kind() != ErrorKind::Ignore {
Expand Down
2 changes: 1 addition & 1 deletion crates/swc_ecma_minifier/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
//! `SWC_RUN` to `1`, the minifier will validate the code using node before each
//! step.
#![deny(clippy::all)]
#![allow(clippy::blocks_in_if_conditions)]
#![allow(clippy::blocks_in_conditions)]
#![allow(clippy::collapsible_else_if)]
#![allow(clippy::collapsible_if)]
#![allow(clippy::ptr_arg)]
Expand Down
2 changes: 1 addition & 1 deletion crates/swc_ecma_transforms_module/src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ pub(super) fn use_strict() -> Stmt {
}

/// Private `_exports` ident.
pub(super) struct Exports(pub Ident);
pub(super) struct Exports(#[allow(dead_code)] pub Ident);

impl Default for Exports {
fn default() -> Self {
Expand Down
1 change: 1 addition & 0 deletions crates/swc_ecma_transforms_testing/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,7 @@ fn exec_with_node_test_runner(src: &str) -> Result<(), ()> {

let mut tmp = OpenOptions::new()
.create(true)
.truncate(true)
.write(true)
.open(&path)
.expect("failed to create a temp file");
Expand Down
2 changes: 1 addition & 1 deletion crates/swc_estree_compat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ version = "0.198.5"
bench = false

[dependencies]
ahash = { version = "0.8.5", features = ["compile-time-rng"] }
ahash = { version = "0.8.8", features = ["compile-time-rng"] }
anyhow = "1"
copyless = "0.1.5"
rayon = "1.7.0"
Expand Down
1 change: 0 additions & 1 deletion crates/swc_estree_compat/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#![deny(clippy::all)]
#![allow(clippy::large_enum_variant)]
#![allow(clippy::upper_case_acronyms)]
#![feature(type_name_of_val)]
#![feature(never_type)]

pub mod babelify;
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2023-11-04
nightly-2024-02-06