mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-10-03 07:04:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[red-knot] Move typeshed VERSIONS parser to the module resolver crate (#11967)

Browse source
This commit is contained in:
Alex Waygood 2024-06-21 16:41:08 +01:00 • committed by GitHub
parent 3277d031f8
commit 8de0cd6565
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -1973,7 +1973,6 @@ dependencies = [
"dashmap", "dashmap",
"hashbrown 0.14.5", "hashbrown 0.14.5",
"indexmap", "indexmap",
"insta",
"is-macro", "is-macro",
"notify", "notify",
"parking_lot", "parking_lot",
@ -1983,7 +1982,6 @@ dependencies = [
"ruff_notebook", "ruff_notebook",
"ruff_python_ast", "ruff_python_ast",
"ruff_python_parser", "ruff_python_parser",
"ruff_python_stdlib",
"ruff_text_size", "ruff_text_size",
"rustc-hash", "rustc-hash",
"smol_str", "smol_str",
@ -1998,8 +1996,10 @@ name = "red_knot_module_resolver"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"insta",
"ruff_db", "ruff_db",
"ruff_python_stdlib", "ruff_python_stdlib",
"rustc-hash",
"salsa", "salsa",
"smol_str", "smol_str",
"tempfile", "tempfile",

2
crates/red_knot/Cargo.toml
View file

@ -16,7 +16,6 @@ red_knot_module_resolver = { workspace = true }
ruff_python_parser = { workspace = true } ruff_python_parser = { workspace = true }
ruff_python_ast = { workspace = true } ruff_python_ast = { workspace = true }
ruff_python_stdlib = { workspace = true }
ruff_text_size = { workspace = true } ruff_text_size = { workspace = true }
ruff_index = { workspace = true } ruff_index = { workspace = true }
ruff_notebook = { workspace = true } ruff_notebook = { workspace = true }
@ -39,7 +38,6 @@ tracing-subscriber = { workspace = true }
tracing-tree = { workspace = true } tracing-tree = { workspace = true }
[dev-dependencies] [dev-dependencies]
insta = { workspace = true }
tempfile = { workspace = true } tempfile = { workspace = true }
[lints] [lints]

1
crates/red_knot/src/lib.rs
View file

@ -19,7 +19,6 @@ mod parse;
pub mod program; pub mod program;
mod semantic; mod semantic;
pub mod source; pub mod source;
pub mod typeshed_versions;
pub mod watch; pub mod watch;
pub(crate) type FxDashMap<K, V> = dashmap::DashMap<K, V, BuildHasherDefault<FxHasher>>; pub(crate) type FxDashMap<K, V> = dashmap::DashMap<K, V, BuildHasherDefault<FxHasher>>;

2
crates/red_knot_module_resolver/Cargo.toml
View file

@ -14,6 +14,7 @@ license = { workspace = true }
ruff_db = { workspace = true } ruff_db = { workspace = true }
ruff_python_stdlib = { workspace = true } ruff_python_stdlib = { workspace = true }
rustc-hash = { workspace = true }
salsa = { workspace = true } salsa = { workspace = true }
smol_str = { workspace = true } smol_str = { workspace = true }
tracing = { workspace = true } tracing = { workspace = true }
@ -25,6 +26,7 @@ zip = { workspace = true }
[dev-dependencies] [dev-dependencies]
anyhow = { workspace = true } anyhow = { workspace = true }
insta = { workspace = true }
tempfile = { workspace = true } tempfile = { workspace = true }
[lints] [lints]

1
crates/red_knot_module_resolver/src/lib.rs
View file

@ -6,3 +6,4 @@ mod typeshed;
pub use db::{Db, Jar}; pub use db::{Db, Jar};
pub use module::{ModuleKind, ModuleName}; pub use module::{ModuleKind, ModuleName};
pub use resolver::{resolve_module, set_module_resolution_settings, ModuleResolutionSettings}; pub use resolver::{resolve_module, set_module_resolution_settings, ModuleResolutionSettings};
pub use typeshed::versions::TypeshedVersions;

2
crates/red_knot_module_resolver/src/typeshed.rs
View file

@ -1,3 +1,5 @@
pub(crate) mod versions;
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use std::io::{self, Read}; use std::io::{self, Read};

38
crates/red_knot/src/typeshed_versions.rs → crates/red_knot_module_resolver/src/typeshed/versions.rs
View file

@ -320,30 +320,28 @@ mod tests {
#[allow(unsafe_code)] #[allow(unsafe_code)]
const ONE: NonZeroU16 = unsafe { NonZeroU16::new_unchecked(1) }; const ONE: NonZeroU16 = unsafe { NonZeroU16::new_unchecked(1) };
// TODO(Alex): move VERSIONS parsing logic to red_knot_module_resolver, add this test back #[test]
// fn can_parse_vendored_versions_file() {
// #[test] let versions_data = include_str!(concat!(
// fn can_parse_vendored_versions_file() { env!("CARGO_MANIFEST_DIR"),
// let versions_data = include_str!(concat!( "/vendor/typeshed/stdlib/VERSIONS"
// env!("CARGO_MANIFEST_DIR"), ));
// "/vendor/typeshed/stdlib/VERSIONS"
// ));
// let versions = TypeshedVersions::from_str(versions_data).unwrap(); let versions = TypeshedVersions::from_str(versions_data).unwrap();
// assert!(versions.len() > 100); assert!(versions.len() > 100);
// assert!(versions.len() < 1000); assert!(versions.len() < 1000);
// assert!(versions.contains_module("asyncio")); assert!(versions.contains_module("asyncio"));
// assert!(versions.module_exists_on_version("asyncio", SupportedPyVersion::Py310)); assert!(versions.module_exists_on_version("asyncio", SupportedPyVersion::Py310));
// assert!(versions.contains_module("asyncio.staggered")); assert!(versions.contains_module("asyncio.staggered"));
// assert!(versions.module_exists_on_version("asyncio.staggered", SupportedPyVersion::Py38)); assert!(versions.module_exists_on_version("asyncio.staggered", SupportedPyVersion::Py38));
// assert!(!versions.module_exists_on_version("asyncio.staggered", SupportedPyVersion::Py37)); assert!(!versions.module_exists_on_version("asyncio.staggered", SupportedPyVersion::Py37));
// assert!(versions.contains_module("audioop")); assert!(versions.contains_module("audioop"));
// assert!(versions.module_exists_on_version("audioop", SupportedPyVersion::Py312)); assert!(versions.module_exists_on_version("audioop", SupportedPyVersion::Py312));
// assert!(!versions.module_exists_on_version("audioop", SupportedPyVersion::Py313)); assert!(!versions.module_exists_on_version("audioop", SupportedPyVersion::Py313));
// } }
#[test] #[test]
fn can_parse_mock_versions_file() { fn can_parse_mock_versions_file() {