Skip to content

Commit

Permalink
Use touch over set_permission and set_revision in Tests
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaReiser committed Jun 14, 2024
1 parent e5e8da6 commit 2348fe6
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
3 changes: 1 addition & 2 deletions crates/ruff_db/src/source.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ impl std::fmt::Debug for SourceText {

#[cfg(test)]
mod tests {
use filetime::FileTime;
use salsa::EventKind;

use ruff_source_file::OneIndexed;
Expand All @@ -80,7 +79,7 @@ mod tests {
db.file_system_mut()
.write_file(path, "x = 20".to_string())
.unwrap();
file.set_revision(&mut db).to(FileTime::now().into());
file.touch(&mut db);

assert_eq!(&*source_text(&db, file), "x = 20");

Expand Down
1 change: 1 addition & 0 deletions crates/ruff_db/src/vfs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ impl VfsFile {
Self::touch_impl(db, &path, Some(self));
}

/// Private method providing the implementation for [`Self::touch_path`] and [`Self::touch`].
fn touch_impl(db: &mut dyn Db, path: &VfsPath, file: Option<VfsFile>) {
match path {
VfsPath::FileSystem(path) => {
Expand Down
2 changes: 1 addition & 1 deletion crates/ruff_python_semantic/src/module.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ impl ModuleName {
return None;
}

if name.split('.').all(|component| is_identifier(component)) {
if name.split('.').all(is_identifier) {
Some(Self(name))
} else {
None
Expand Down
12 changes: 6 additions & 6 deletions crates/ruff_python_semantic/src/module/resolver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::ops::Deref;
use std::sync::Arc;

use ruff_db::file_system::{FileSystem, FileSystemPath, FileSystemPathBuf};
use ruff_db::vfs::{file_system_path_to_file, vfs_path_to_file, VfsFile, VfsPath};
use ruff_db::vfs::{system_path_to_file, vfs_path_to_file, VfsFile, VfsPath};

use crate::module::resolver::internal::ModuleResolverSearchPaths;
use crate::module::{
Expand Down Expand Up @@ -258,13 +258,13 @@ fn resolve_name(db: &dyn Db, name: &ModuleName) -> Option<(ModuleSearchPath, Vfs
// TODO Implement full https://peps.python.org/pep-0561/#type-checker-module-resolution-order resolution
let stub = package_path.with_extension("pyi");

if let Some(stub) = file_system_path_to_file(db.upcast(), &stub) {
if let Some(stub) = system_path_to_file(db.upcast(), &stub) {
return Some((search_path.clone(), stub, kind));
}

let module = package_path.with_extension("py");

if let Some(module) = file_system_path_to_file(db.upcast(), &module) {
if let Some(module) = system_path_to_file(db.upcast(), &module) {
return Some((search_path.clone(), module, kind));
}

Expand Down Expand Up @@ -376,7 +376,7 @@ impl PackageKind {
mod tests {

use ruff_db::file_system::{FileSystemPath, FileSystemPathBuf};
use ruff_db::vfs::{file_system_path_to_file, VfsFile, VfsPath};
use ruff_db::vfs::{system_path_to_file, VfsFile, VfsPath};

use crate::db::tests::TestDb;
use crate::module::{ModuleKind, ModuleName};
Expand Down Expand Up @@ -872,7 +872,7 @@ mod tests {
let foo_module_name = ModuleName::new_static("foo").unwrap();
let foo_module = resolve_module(&db, foo_module_name.clone()).unwrap();

let bar = file_system_path_to_file(&db, &bar_path).expect("bar.py to exist");
let bar = system_path_to_file(&db, &bar_path).expect("bar.py to exist");

db.clear_salsa_events();

Expand Down Expand Up @@ -907,7 +907,7 @@ mod tests {
// Now write the foo file
db.memory_file_system().write_file(&foo_path, "x = 1")?;
VfsFile::touch_path(&mut db, &VfsPath::FileSystem(foo_path.clone()));
let foo_file = file_system_path_to_file(&db, &foo_path).expect("foo.py to exist");
let foo_file = system_path_to_file(&db, &foo_path).expect("foo.py to exist");

let foo_module = resolve_module(&db, foo_module_name).expect("Foo module to resolve");
assert_eq!(foo_file, foo_module.file());
Expand Down

0 comments on commit 2348fe6

Please sign in to comment.