Skip to content

Move compiler/codegen -> crates/codegen #6260

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.

Sign up for GitHub

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

Merged
youknowone merged 3 commits into from
Nov 15, 2025
Merged

Move compiler/codegen -> crates/codegen #6260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b63b29c
Move `compiler/codegen` -> `crates/codegen`
ShaharNaveh Nov 14, 2025
07a93c7
Merge branch 'main' into move-compiler-codegen
youknowone Nov 14, 2025
7813397
Merge remote-tracking branch 'upstream/main' into move-compiler-codegen
ShaharNaveh Nov 15, 2025
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
3 changes: 1 addition & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ template = "installer-config/installer.wxs"
resolver = "2"
members = [
"compiler",
"compiler/codegen",
".",
"derive",
"jit",
Expand All @@ -145,7 +144,7 @@ license = "MIT"
[workspace.dependencies]
rustpython-compiler-core = { path = "crates/compiler-core", version = "0.4.0" }
rustpython-compiler = { path = "compiler", version = "0.4.0" }
rustpython-codegen = { path = "compiler/codegen", version = "0.4.0" }
rustpython-codegen = { path = "crates/codegen", version = "0.4.0" }
Copy link
Contributor

@coderabbitai coderabbitai bot Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

🧩 Analysis chain

Verify the directory move is complete and no stale references remain.

The workspace dependency path has been correctly updated from "compiler/codegen" to "crates/codegen". However, per the past review comments, this structural change requires verification:

  1. Confirm the crates/codegen directory exists with the expected crate content
  2. Ensure no lingering references to compiler/codegen remain in source files or build configuration
  3. Verify the stale comment reference in vm/src/stdlib/ast.rs:307 (which references compiler/codegen/src/compile.rs) has been updated to crates/codegen/src/compile.rs

🏁 Script executed:

#!/bin/bash
# Description: Verify the crates/codegen directory move is complete and comprehensive.

# Check 1: Verify crates/codegen directory exists
if [ -d "crates/codegen" ]; then
  echo "✓ crates/codegen directory found"
else
  echo "✗ crates/codegen directory NOT found"
  exit 1
fi

# Check 2: Verify old compiler/codegen directory has been removed
if [ -d "compiler/codegen" ]; then
  echo "✗ WARNING: Old compiler/codegen directory STILL EXISTS (should be removed)"
else
  echo "✓ Old compiler/codegen directory removed"
fi

# Check 3: Search for remaining references to old path in code
echo ""
echo "Checking for remaining references to 'compiler/codegen' in source/config files:"
rg -n "compiler/codegen" --type rust --type toml --type yaml --type json -g '!target' -g '!.git' || echo "✓ No references found"

# Check 4: Verify the stale comment in ast.rs has been updated
echo ""
echo "Checking vm/src/stdlib/ast.rs:307 for updated path:"
if [ -f "vm/src/stdlib/ast.rs" ]; then
  sed -n '305,310p' vm/src/stdlib/ast.rs
else
  echo "✗ vm/src/stdlib/ast.rs not found"
fi

# Check 5: Verify crates/codegen/Cargo.toml exists
if [ -f "crates/codegen/Cargo.toml" ]; then
  echo ""
  echo "✓ crates/codegen/Cargo.toml found"
else
  echo ""
  echo "✗ crates/codegen/Cargo.toml NOT found"
fi

Length of output: 580

Update the stale comment reference in vm/src/stdlib/ast.rs:307.

The Cargo.toml path update to "crates/codegen" is correct and the directory move is complete (old compiler/codegen directory has been removed). However, the comment at vm/src/stdlib/ast.rs:307 still references the old path and should be updated from compiler/codegen/src/compile.rs to crates/codegen/src/compile.rs.

🤖 Prompt for AI Agents 
In vm/src/stdlib/ast.rs around line 307, the in-file comment still references
the old path "compiler/codegen/src/compile.rs"; update that comment to reference
the new location "crates/codegen/src/compile.rs" so the comment matches the
Cargo.toml change and the moved directory.

rustpython-common = { path = "crates/common", version = "0.4.0" }
rustpython-derive = { path = "derive", version = "0.4.0" }
rustpython-derive-impl = { path = "derive-impl", version = "0.4.0" }
Expand Down
0 compiler/codegen/Cargo.toml → crates/codegen/Cargo.toml
View file
Open in desktop
File renamed without changes.
0 compiler/codegen/src/compile.rs → crates/codegen/src/compile.rs
View file
Open in desktop
File renamed without changes.
0 compiler/codegen/src/error.rs → crates/codegen/src/error.rs
View file
Open in desktop
File renamed without changes.
0 compiler/codegen/src/ir.rs → crates/codegen/src/ir.rs
View file
Open in desktop
File renamed without changes.
0 compiler/codegen/src/lib.rs → crates/codegen/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 ...hon_codegen__compile__tests__if_ands.snap → ...hon_codegen__compile__tests__if_ands.snap
View file
Open in desktop
File renamed without changes.
0 ...on_codegen__compile__tests__if_mixed.snap → ...on_codegen__compile__tests__if_mixed.snap
View file
Open in desktop
File renamed without changes.
0 ...thon_codegen__compile__tests__if_ors.snap → ...thon_codegen__compile__tests__if_ors.snap
View file
Open in desktop
File renamed without changes.
0 ...ile__tests__nested_double_async_with.snap → ...ile__tests__nested_double_async_with.snap
View file
Open in desktop
File renamed without changes.
0 ...mpiler_core__compile__tests__if_ands.snap → ...mpiler_core__compile__tests__if_ands.snap
View file
Open in desktop
File renamed without changes.
0 ...piler_core__compile__tests__if_mixed.snap → ...piler_core__compile__tests__if_mixed.snap
View file
Open in desktop
File renamed without changes.
0 ...ompiler_core__compile__tests__if_ors.snap → ...ompiler_core__compile__tests__if_ors.snap
View file
Open in desktop
File renamed without changes.
0 ...ile__tests__nested_double_async_with.snap → ...ile__tests__nested_double_async_with.snap
View file
Open in desktop
File renamed without changes.
0 compiler/codegen/src/string_parser.rs → crates/codegen/src/string_parser.rs
View file
Open in desktop
File renamed without changes.
0 compiler/codegen/src/symboltable.rs → crates/codegen/src/symboltable.rs
View file
Open in desktop
File renamed without changes.
0 compiler/codegen/src/unparse.rs → crates/codegen/src/unparse.rs
View file
Open in desktop
File renamed without changes.
Loading