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

chore(deps): update dependency rust to v1.85.0 #9263

Merged
merged 1 commit into from
Feb 21, 2025
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/oxc_allocator/src/boxed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ impl<T> Box<'_, T> {
/// # SAFETY
/// Safe to create, but must never be dereferenced, as does not point to a valid `T`.
/// Only purpose is for mocking types without allocating for const assertions.
#[expect(unsafe_code, clippy::missing_safety_doc)]
#[expect(unsafe_code)]
pub const unsafe fn dangling() -> Self {
const { Self::ASSERT_T_IS_NOT_DROP };

Expand Down
4 changes: 2 additions & 2 deletions crates/oxc_allocator/src/string.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ impl<'alloc> String<'alloc> {
/// Caller must ensure this `Vec<u8>` comprises a valid UTF-8 string.
//
// `#[inline(always)]` because this is a no-op at runtime
#[expect(clippy::missing_safety_doc, clippy::unnecessary_safety_comment)]
#[expect(clippy::unnecessary_safety_comment)]
#[inline(always)]
pub unsafe fn from_utf8_unchecked(bytes: Vec<'alloc, u8>) -> String<'alloc> {
// Cannot use `bumpalo::String::from_utf8_unchecked` because it takes a `bumpalo::collections::Vec`,
Expand Down Expand Up @@ -149,7 +149,7 @@ impl<'alloc> String<'alloc> {
/// assert_eq!(s, "hello");
/// }
/// ```
#[expect(clippy::missing_safety_doc, clippy::unnecessary_safety_comment)]
#[expect(clippy::unnecessary_safety_comment)]
#[inline(always)]
pub unsafe fn from_raw_parts_in(
buf: *mut u8,
Expand Down
2 changes: 1 addition & 1 deletion crates/oxc_codegen/tests/integration/main.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![expect(clippy::missing_panics_doc)]
#![expect(clippy::missing_panics_doc, clippy::literal_string_with_formatting_args)]
pub mod esbuild;
pub mod jsdoc;
pub mod legal_comments;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ use oxc_span::SourceType;
// run `cargo run -p oxc_isolated_declarations --example isolated_declarations`
// or `just example isolated_declarations`

fn main() {
fn main() -> std::io::Result<()> {
let name = env::args().nth(1).unwrap_or_else(|| "test.tsx".to_string());
let path = Path::new(&name);
let source_text = std::fs::read_to_string(path).expect("{name} not found");
let source_text = std::fs::read_to_string(path)?;
let allocator = Allocator::default();
let source_type = SourceType::from_path(path).unwrap();

Expand All @@ -26,7 +26,7 @@ fn main() {
let error = error.with_source_code(source_text.clone());
println!("{error:?}");
}
return;
return Ok(());
}

println!("Original:\n");
Expand All @@ -47,4 +47,6 @@ fn main() {
println!("{error:?}");
}
}

Ok(())
}
1 change: 1 addition & 0 deletions crates/oxc_linter/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#![expect(clippy::self_named_module_files)] // for rules.rs
#![allow(clippy::literal_string_with_formatting_args)]

#[cfg(test)]
mod tester;
Expand Down
6 changes: 3 additions & 3 deletions crates/oxc_linter/src/rules/eslint/no_unused_vars/options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -570,9 +570,9 @@ impl TryFrom<Value> for NoUnusedVarsOptions {
})
}
Value::Null => Ok(Self::default()),
_ => Err(OxcDiagnostic::error(
"Invalid 'vars' option for no-unused-vars: Expected a string or an object, got {config}",
)),
_ => Err(OxcDiagnostic::error(format!(
"Invalid 'vars' option for no-unused-vars: Expected a string or an object, got {config}"
))),
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion crates/oxc_minifier/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! ECMAScript Minifier

#![allow(clippy::needless_pass_by_ref_mut)]
#![allow(clippy::needless_pass_by_ref_mut, clippy::literal_string_with_formatting_args)]

mod compressor;
mod ctx;
Expand Down
2 changes: 2 additions & 0 deletions crates/oxc_minifier/tests/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![allow(clippy::literal_string_with_formatting_args)]

mod ecmascript;
mod mangler;
mod peephole;
Expand Down
1 change: 1 addition & 0 deletions crates/oxc_semantic/src/jsdoc/parser/jsdoc_parts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ impl<'a> JSDocTagTypeNamePart<'a> {
}

#[cfg(test)]
#[expect(clippy::literal_string_with_formatting_args)]
mod test {
use oxc_span::{Span, SPAN};

Expand Down
7 changes: 4 additions & 3 deletions crates/oxc_semantic/tests/integration/scopes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,19 @@ fn test_function_level_strict() {
)
.with_module(false);

tester.has_some_symbol("x")
tester
.has_some_symbol("x")
.is_in_scope(ScopeFlags::StrictMode | ScopeFlags::Function)
.expect(|(semantic, symbol_id)| -> Result<(), &'static str> {
let scope_id = semantic.symbol_scope(symbol_id);
let Some(parent_scope_id) = semantic.scopes().get_parent_id(scope_id) else {
return Err("Expected x's scope to have a parent")
return Err("Expected x's scope to have a parent");
};
let parent_flags = semantic.scopes().get_flags(parent_scope_id);
if parent_flags.contains(ScopeFlags::Top) {
Ok(())
} else {
Err("Expected x to be in a top-level function declaration, but its parent scope has flags {parent_flags:?}")
Err("Expected x to be in a top-level function declaration.")
}
})
.test();
Expand Down
2 changes: 1 addition & 1 deletion crates/oxc_syntax/src/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ impl NodeId {
///
/// # SAFETY
/// `idx` must not be `u32::MAX`.
#[expect(clippy::missing_safety_doc, clippy::unnecessary_safety_comment)]
#[expect(clippy::unnecessary_safety_comment)]
pub const unsafe fn new_unchecked(idx: u32) -> Self {
// SAFETY: Caller must ensure `idx` is not `u32::MAX`
Self(NonMaxU32::new_unchecked(idx))
Expand Down
2 changes: 1 addition & 1 deletion crates/oxc_syntax/src/scope.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ impl ScopeId {
///
/// # SAFETY
/// `idx` must not be `u32::MAX`.
#[expect(clippy::missing_safety_doc, clippy::unnecessary_safety_comment)]
#[expect(clippy::unnecessary_safety_comment)]
pub const unsafe fn new_unchecked(idx: u32) -> Self {
// SAFETY: Caller must ensure `idx` is not `u32::MAX`
Self(NonMaxU32::new_unchecked(idx))
Expand Down
2 changes: 1 addition & 1 deletion crates/oxc_syntax/src/symbol.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ impl SymbolId {
///
/// # SAFETY
/// `idx` must not be `u32::MAX`.
#[expect(clippy::missing_safety_doc, clippy::unnecessary_safety_comment)]
#[expect(clippy::unnecessary_safety_comment)]
pub const unsafe fn new_unchecked(idx: u32) -> Self {
// SAFETY: Caller must ensure `idx` is not `u32::MAX`
Self(NonMaxU32::new_unchecked(idx))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2165,8 +2165,8 @@ impl<'a> ClassProperties<'a, '_> {
}
}

/// * [`Helper::ReadOnlyError`]: `_readOnlyError("#method")`
/// * [`Helper::WriteOnlyError`]: `_writeOnlyError("#method")`
/// * [`Helper::ReadOnlyError`][]: `_readOnlyError("#method")`
/// * [`Helper::WriteOnlyError`][]: `_writeOnlyError("#method")`
fn create_throw_error(
&self,
helper: Helper,
Expand Down
3 changes: 2 additions & 1 deletion crates/oxc_traverse/scripts/lib/walk.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ export default function generateWalkFunctionsCode(types) {
clippy::semicolon_if_nothing_returned,
clippy::ptr_as_ptr,
clippy::ref_as_ptr,
clippy::cast_ptr_alignment
clippy::cast_ptr_alignment,
clippy::borrow_as_ptr
)]

use std::{cell::Cell, marker::PhantomData};
Expand Down
1 change: 0 additions & 1 deletion crates/oxc_traverse/src/context/reusable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ impl<'a> ReusableTraverseCtx<'a> {
///
/// [`TraverseAncestry`]: super::TraverseAncestry
#[inline]
#[expect(clippy::missing_safety_doc)]
pub unsafe fn unwrap(self) -> TraverseCtx<'a> {
self.0
}
Expand Down
3 changes: 2 additions & 1 deletion crates/oxc_traverse/src/generated/walk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
clippy::semicolon_if_nothing_returned,
clippy::ptr_as_ptr,
clippy::ref_as_ptr,
clippy::cast_ptr_alignment
clippy::cast_ptr_alignment,
clippy::borrow_as_ptr
)]

use std::{cell::Cell, marker::PhantomData};
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.84.1"
channel = "1.85.0"
profile = "default"
2 changes: 1 addition & 1 deletion tasks/coverage/src/babel/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ impl<T: Case> Suite<T> for BabelSuite<T> {
]
.iter()
.any(|p| path.to_string_lossy().contains(p));
let incorrect_extension = path.extension().map_or(true, |ext| ext == "json" || ext == "md");
let incorrect_extension = path.extension().is_none_or(|ext| ext == "json" || ext == "md");
not_supported_directory || incorrect_extension
}

Expand Down
2 changes: 1 addition & 1 deletion tasks/coverage/src/suite.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ pub trait Suite<T: Case> {
.filter(|e| !e.file_type().is_dir())
.map(|e| e.path().to_owned())
.filter(|path| !self.skip_test_path(path))
.filter(|path| filter.map_or(true, |query| path.to_string_lossy().contains(query)))
.filter(|path| filter.is_none_or(|query| path.to_string_lossy().contains(query)))
.collect::<Vec<_>>()
};

Expand Down
2 changes: 1 addition & 1 deletion tasks/prettier_conformance/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ fn collect_test_files(dir: &Path, filter: Option<&String>) -> Vec<PathBuf> {
}
})
.filter(|e| !IGNORE_TESTS.iter().any(|s| e.path().to_string_lossy().contains(s)))
.filter(|e| filter.map_or(true, |name| e.path().to_string_lossy().contains(name)))
.filter(|e| filter.is_none_or(|name| e.path().to_string_lossy().contains(name)))
.map(|e| e.path().to_path_buf())
.collect();
test_files.sort_unstable();
Expand Down
2 changes: 1 addition & 1 deletion tasks/rulegen/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ fn main() {
let context = match body {
Ok(Ok(body)) => {
let allocator = Allocator::default();
let source_type = SourceType::from_path(rule_test_path).expect("incorrect {path:?}");
let source_type = SourceType::from_path(rule_test_path).unwrap();
let ret = Parser::new(&allocator, &body, source_type).parse();

let mut state = State::new(&body);
Expand Down
Loading