diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index c6d7371f..cc90be0b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -51,8 +51,8 @@ jobs: - run: cargo fmt --all -- --check - run: cargo clippy --all -- -D warnings - # test_utils requires tokio rt-multi-thread, which does not compile on wasm - - run: cargo clippy --workspace --exclude test_utils --target wasm32-unknown-unknown -- -D warnings + # test-utils requires tokio rt-multi-thread, which does not compile on wasm + - run: cargo clippy --workspace --exclude test-utils --target wasm32-unknown-unknown -- -D warnings - run: cargo test --all # docs-only lock (AGENTS.md "Round Worklog") — one runner, not the 6-cell matrix diff --git a/AGENTS.md b/AGENTS.md index 20f74ca4..9100d0f1 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -21,11 +21,12 @@ ## Project Structure - `jvm/` - Core JVM implementation (`#![no_std]`) -- `jvm_rust/` - Rust-based JVM interpreter -- `java_runtime/` - Java standard library implementations +- `jvm-bytecode/` - JVM class and bytecode implementation +- `rustjava-runtime/` - Java standard library implementations - `classfile/` - Class file parser -- `java_class_proto/` - Java class prototypes -- `test_utils/` - Shared test utilities +- `jvm-class-proto/` - Java class prototypes +- `jvm-types/` - Shared JVM metadata types +- `test-utils/` - Shared test utilities ## Round Worklog `docs/worklog/` — human `.md` + machine `.json`, always a pair When a round leaves follow-up proposals or their disposition, drop **two files with the same @@ -80,9 +81,9 @@ print('open cards:',p-a)" - ⒝ **< 5** ⇒ 의무화해도 카드가 늘지 않았다는 뜻이므로 **의무 자체를 재검토**하라. Baseline measured 2026-09-04: 9 proposals − 4 disposed = **5 open**. So ⒝ means "fewer than today". ## Testing Boundaries -- Keep `java_runtime/tests/classes` limited to Java standard library class and API behavior. -- Test JVM and interpreter semantics, including class initialization, bytecode execution, and monitor behavior, with compiled Java fixtures under `test_data/src` and expected output under `test_data`, executed by `tests/test_class.rs`. -- Do not place JVM core behavior tests in the `java_runtime` standard library test tree. +- Keep `rustjava-runtime/tests/classes` limited to Java standard library class and API behavior. +- Test JVM and interpreter semantics, including class initialization, bytecode execution, and monitor behavior, with compiled Java fixtures under `test-data/src` and expected output under `test-data`, executed by `tests/test_class.rs`. +- Do not place JVM core behavior tests in the `rustjava-runtime` standard library test tree. ## Compatibility Sources - Implement Java compatibility from public specifications, Javadocs, and observable behavior tests. Do not consult or reproduce OpenJDK or other Java runtime implementation source code; keep the implementation independent to avoid licensing and provenance concerns. diff --git a/Cargo.lock b/Cargo.lock index d2826c13..2069c620 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,23 @@ # It is not intended for manual editing. version = 4 +[[package]] +name = "RustJava" +version = "0.1.1" +dependencies = [ + "anyhow", + "async-trait", + "bytemuck", + "jvm", + "jvm-bytecode", + "jvm-class-proto", + "rustjava-runtime", + "test-utils", + "tokio", + "tracing", + "tracing-subscriber", +] + [[package]] name = "adler2" version = "2.0.1" @@ -86,9 +103,9 @@ dependencies = [ [[package]] name = "classfile" -version = "0.0.1" +version = "0.1.1" dependencies = [ - "java_constants", + "jvm-types", "nom", ] @@ -295,50 +312,9 @@ dependencies = [ "hashbrown", ] -[[package]] -name = "java_class_proto" -version = "0.0.1" -dependencies = [ - "async-trait", - "dyn-clone", - "java_constants", - "jvm", -] - -[[package]] -name = "java_constants" -version = "0.0.1" -dependencies = [ - "bitflags", -] - -[[package]] -name = "java_runtime" -version = "0.0.1" -dependencies = [ - "async-trait", - "bytemuck", - "chrono", - "dyn-clone", - "encoding_rs", - "hashbrown", - "java_class_proto", - "java_constants", - "jvm", - "jvm_rust", - "libm", - "parking_lot", - "regex", - "test_utils", - "tokio", - "tracing", - "url", - "zip", -] - [[package]] name = "jvm" -version = "0.0.1" +version = "0.1.1" dependencies = [ "anyhow", "async-recursion", @@ -348,30 +324,47 @@ dependencies = [ "dyn-hash", "event-listener", "hashbrown", - "java_constants", + "jvm-types", "nom", "parking_lot", - "test_utils", + "test-utils", "tokio", "tracing", ] [[package]] -name = "jvm_rust" -version = "0.0.1" +name = "jvm-bytecode" +version = "0.1.1" dependencies = [ "async-recursion", "async-trait", "bytemuck", "classfile", "dyn-clone", - "java_class_proto", - "java_constants", "jvm", + "jvm-class-proto", + "jvm-types", "parking_lot", "tracing", ] +[[package]] +name = "jvm-class-proto" +version = "0.1.1" +dependencies = [ + "async-trait", + "dyn-clone", + "jvm", + "jvm-types", +] + +[[package]] +name = "jvm-types" +version = "0.1.1" +dependencies = [ + "bitflags", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -568,20 +561,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] -name = "rust_java" -version = "0.0.1" +name = "rustjava-runtime" +version = "0.1.1" dependencies = [ - "anyhow", "async-trait", "bytemuck", - "java_class_proto", - "java_runtime", + "chrono", + "dyn-clone", + "encoding_rs", + "hashbrown", "jvm", - "jvm_rust", - "test_utils", + "jvm-bytecode", + "jvm-class-proto", + "jvm-types", + "libm", + "parking_lot", + "regex", + "test-utils", "tokio", "tracing", - "tracing-subscriber", + "url", + "zip", ] [[package]] @@ -651,13 +651,13 @@ dependencies = [ ] [[package]] -name = "test_utils" -version = "0.0.1" +name = "test-utils" +version = "0.1.1" dependencies = [ "async-trait", - "java_runtime", "jvm", - "jvm_rust", + "jvm-bytecode", + "rustjava-runtime", "tokio", "tracing", ] diff --git a/Cargo.toml b/Cargo.toml index 985b8c5a..60f52afb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,10 +1,11 @@ [workspace] -members = ["classfile", "java_runtime", "jvm", "jvm_rust", "test_utils"] +members = ["classfile", "jvm", "jvm-bytecode", "jvm-class-proto", "jvm-types", "rustjava-runtime"] [workspace.package] -version = "0.0.1" +version = "0.1.1" edition = "2024" license = "MIT" +repository = "https://github.com/dlunch/RustJava" [workspace.dependencies] anyhow = { version = "^1.0", default-features = false } @@ -20,22 +21,29 @@ tracing = { version = "^0.1", default-features = false } tokio = { version = "^1.52", features = ["macros"] } -classfile = { path = "classfile" } -java_class_proto = { path = "java_class_proto" } -java_constants = { path = "java_constants" } -java_runtime = { path = "java_runtime" } -jvm = { path = "jvm" } -jvm_rust = { path = "jvm_rust" } -test_utils = { path = "test_utils" } +classfile = { path = "classfile", version = "0.1.1" } +jvm = { path = "jvm", version = "0.1.1" } +jvm-bytecode = { path = "jvm-bytecode", version = "0.1.1" } +jvm-class-proto = { path = "jvm-class-proto", version = "0.1.1" } +jvm-types = { path = "jvm-types", version = "0.1.1" } +rustjava-runtime = { path = "rustjava-runtime", version = "0.1.1" } +test-utils = { path = "test-utils" } [package] -name = "rust_java" +name = "RustJava" +description = "An embeddable JVM and Java runtime implemented in Rust" +exclude = ["docs"] version.workspace = true edition.workspace = true license.workspace = true +repository.workspace = true + +[lib] +name = "rust_java" [[bin]] name = "rust_java" +path = "src/main.rs" [dependencies] async-trait = { workspace = true } @@ -46,12 +54,12 @@ tracing = { workspace = true } tracing-subscriber = { version = "^0.3", features = ["env-filter"] } jvm = { workspace = true } -jvm_rust = { workspace = true } -java_class_proto = { workspace = true } -java_runtime = { workspace = true } +jvm-bytecode = { workspace = true } +jvm-class-proto = { workspace = true } +rustjava-runtime = { workspace = true } [dev-dependencies] -test_utils = { workspace = true } +test-utils = { workspace = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] tokio = { workspace = true, features = ["rt-multi-thread", "time"] } diff --git a/REPORT.md b/REPORT.md index 956868a6..1d348746 100644 --- a/REPORT.md +++ b/REPORT.md @@ -1,5 +1,34 @@ # REPORT +## [2026-09-04] upstream 동기 S8 — 컷 `bd42427` 개명 스윕 · ★**behind 0** (rustjava-upstream-sync-s8-rename-sweep-decision) +- 무엇을: upstream `bd42427` 까지 **12커밋**(crates.io 공개 준비 개명 스윕)을 `--merge` 로 흡수하고 충돌 **8건**을 해소했다. + ★★**`merge-base` `ba5797b` → `bd42427` · behind `12` → ★`0`** · 부모 **2개** + ⇒ ★★★**upstream 을 «완전히» 따라잡았다**(2026-08-16 계획 착수 시 behind 33 → 오늘 0). +- 왜: 운영자 채택 제안 `2026-09-03-upstream-sync-s5-s7-remeasure#p0` — 「개명이 우리 픽스처를 **조용히 지울 수 있다**」. + ★**이 회차의 산출은 코드가 아니라 «판정»**이었다: 어느 픽스처가 어디로 가는가. +- 사용자 영향: **크레이트 이름이 공개용으로 바뀐다**(`java_runtime`→`rustjava-runtime` · `jvm_rust`→`jvm-bytecode` · + `java_class_proto`→`jvm-class-proto` · `java_constants`→`jvm-types` · `test_utils`→`test-utils` · + `test_data/`→`test-data/`). ★**런타임 동작 변경 0** · 우리 자산 전수 생존. +- 검증: stable 4종 + ★beta 2종 rc=0 · `cargo test --all` **554 / 0 / 1** · beta 도 **554 동수** · + ★증감 0 이고 그것이 맞다(upstream 테스트 함수도 **547 → 547** — 개명 스윕이라 추가 0) · + `#[ignore]` **1 → 1** · 우리 테스트 함수 **558 → 558**. +- ★★**두려워한 형태(modify/delete)가 «0건»이었다.** git 이 `CONFLICT (file location)` + `AU` 로 처리해 + 우리 고유 **6건**을 새 경로로 **이미 옮겨** 두고 «이동 확인»만 요구했다 ⇒ 처분은 **「간다」 전건**이고 + ★**`origin/main` 블롭 ↔ 새 경로 해시가 6건 전부 동일**(바이트 보존) · ★**픽스처 수 5 → 5**. + ★「남는다/버린다」는 **0** — 여섯 다 우리 것이고 upstream 판본으로 **대체된 것이 없다**. +- ★★**대신 개명이 «우리 자산 2건»을 낡게 만들었다 — 「우리 자산이 낡는」 5회째이고 «대상»이 처음이다**: + ⑴`.github/workflows/rust.yml` 의 `--exclude test_utils` 가 **옛 크레이트 이름**이라 wasm32 셀이 깨진다 + (★실측: 옛 이름 **rc=101** ↔ 새 이름 **rc=0**) ⑵`tests/test_class_format.rs`(PR #3)의 `"test_data/"` **4곳**. + ★**둘 다 «우리 파일»이라 충돌이 «날 수가 없다»** — 개명 대응표를 그대로 적용했고 upstream 코드는 무접촉. + ⇒ ★**이제 이 형태의 방향이 셋이다**: ⑴upstream 신규 파일 ⑵공용 API 변경 ⑶★**개명**. + ★**⑶은 컴파일이 «절반만» 잡는다** — 경로 문자열은 런타임, CI 설정은 **CI 에서만** 드러난다. +- ★**`Cargo.lock` 하강을 차단했다**(계약6⒞가 «또» 잡았다): `--theirs`+build 가 `tracing` **0.1.44 → 0.1.41** · + `tracing-subscriber` · `syn` 을 내렸다. ★**`tracing` 하강은 PR #4(언프리즈)를 되돌리는 것**이라 + S5 와 같은 처방(`origin/main` lock 에서 재생성)으로 ★**내려간 것 0 · `tracing` 0.1.44 유지**. +- 후속 추천: ⑴**게이트③은 반드시 `--merge`**(등재 repo). ⑵★**behind 0 이 됐으므로 다음 동기 회차는 + «upstream 이 움직일 때»다** — 정기 축이 필요하면 별건 판정. ⑶★**「우리 자산이 낡는」 축의 계약화**가 + 이제 **다섯 회차 미처분**이고, 이번에 **세 번째 방향(개명)**이 드러났다. + ## [2026-09-04] upstream 동기 S7 — 컷 `ba5797b` 머지 + §5 서식에 «델타/누적» 축 (rustjava-upstream-sync-s7-and-fix-the-conflict-count-format) - 무엇을: upstream `ba5797b`(#201 가상 디스패치 해석 · **1커밋** · 319파일 +20,118/−5,729)을 `--merge` 로 흡수하고 충돌 **1건**을 해소했다. 함께 ★**§5 「충돌 수」 정본 서식을 diff --git a/STATE.md b/STATE.md index cf11c6b3..bd17a9b2 100644 --- a/STATE.md +++ b/STATE.md @@ -23,6 +23,24 @@ (25번째 run, 앞선 24건 전부 red). **PR 대기 — 게이트③ 미착지.** ## 완료 +- [rustjava-upstream-sync-s8-rename-sweep-decision] ★★**upstream 컷 `bd42427`(개명 스윕 · 12커밋) 머지 — + ★★★`merge-base` `ba5797b` → `bd42427` · behind ★**12 → 0** · 부모 2개 ⇒ ★★**upstream 을 «완전히» 따라잡았다.** + 착수 재측정(신 서식): **누적 8 · 델타 +8**(base `3fb08a8` · merge-base `ba5797b`) — 「재서 8 이었다」. + ★**개명 대응표**(upstream 이력 실측 · A/D **0** · 전건 R): `java_runtime`→**`rustjava-runtime`**(2홉 · 379건 R079) · + `test_data`→**`test-data`**(243 R083) · `jvm_rust`→`jvm-bytecode` · `java_class_proto`→`jvm-class-proto` · + `java_constants`→`jvm-types` · `test_utils`→`test-utils`. + ★★**modify/delete = «0건»** — 두려워한 형태가 안 나왔다. git 이 `CONFLICT (file location)`+`AU` 로 + 우리 고유 6건을 새 경로로 **이미 옮겨** 두고 이동 확인만 요구했다 ⇒ 처분 「간다」 전건 · + ★**`origin/main` 블롭 대조로 6건 «바이트 동일» 확인** · ★**픽스처 5 → 5**. + ★★**개명이 «우리 자산 2건»을 낡게 만들었다(5회째 · 대상은 처음 — CI·경로)**: + `rust.yml` 의 `--exclude test_utils`(옛 크레이트명 ⇒ wasm32 셀 red · 실측 rc=101↔0) → `test-utils` · + `tests/test_class_format.rs` 의 `"test_data/"` 4곳 → `test-data/`. ★둘 다 «우리 파일»이라 충돌이 날 수 없다. + ★**`Cargo.lock` 하강 차단**: `--theirs`+build 가 `tracing` **0.1.44 → 0.1.41**(=PR #4 언프리즈 되돌림) · + `tracing-subscriber`·`syn` 도 내렸다 ⇒ S5 처방(main lock 에서 재생성)으로 **내려간 것 0**. + green: stable 4종 + beta 2종 rc=0 · **554/0/1**(baseline 554 · 증감 0 이고 맞다 — upstream 도 547→547). + ★게이트③ 완료: PR #24 — ★★**`--merge` 착지**(★`--squash` 아님 · 등재 repo). 머지커밋 sha 는 회신 `merged:` 참조. + ★★★**이 착지가 «캠페인 종료»다 — 2026-08-16 착수 시 behind 33 → 오늘 «0».** S1~S8 컷 조상 8/8. + ★**다음 동기는 «계획된 컷»이 아니라 «upstream 이 움직일 때»다** — 정기 축 여부는 별건 판정(워크로그 `proposals[1]`). - [rustjava-upstream-sync-s7-and-fix-the-conflict-count-format] ★**upstream 컷 `ba5797b`(가상 디스패치 해석 · 1커밋 · 319파일) 머지 — 충돌 1 해소** + ★**§5 「충돌 수」 정본 서식에 «델타/누적» 축을 넣었다.** ★**`merge-base` `95ebc5c` → `ba5797b` · behind 13 → 12 · 부모 2개** ⇒ ★★**계획 7회차(S1~S7) 완주.** diff --git a/classfile/Cargo.toml b/classfile/Cargo.toml index f135b98f..6fd7fd4d 100644 --- a/classfile/Cargo.toml +++ b/classfile/Cargo.toml @@ -1,10 +1,12 @@ [package] name = "classfile" +description = "A no_std parser and validator for Java class files" version.workspace = true edition.workspace = true license.workspace = true +repository.workspace = true [dependencies] nom = { workspace = true } -java_constants = { workspace = true } +jvm-types = { workspace = true } diff --git a/classfile/src/class.rs b/classfile/src/class.rs index 059d6b70..2d6a7c23 100644 --- a/classfile/src/class.rs +++ b/classfile/src/class.rs @@ -7,7 +7,7 @@ use nom::{ number::complete::{be_u16, be_u32}, }; -use java_constants::ClassAccessFlags; +use jvm_types::ClassAccessFlags; use crate::{ ClassFileError, attribute::AttributeInfo, constant_pool::ConstantPoolItem, field::FieldInfo, interface::parse_interface, method::MethodInfo, diff --git a/classfile/src/field.rs b/classfile/src/field.rs index 91489fa9..ef865cfd 100644 --- a/classfile/src/field.rs +++ b/classfile/src/field.rs @@ -7,7 +7,7 @@ use nom::{ number::complete::be_u16, }; -use java_constants::FieldAccessFlags; +use jvm_types::FieldAccessFlags; use crate::{attribute::AttributeInfo, constant_pool::ConstantPoolItem}; diff --git a/classfile/src/method.rs b/classfile/src/method.rs index 620590d5..061f202f 100644 --- a/classfile/src/method.rs +++ b/classfile/src/method.rs @@ -7,7 +7,7 @@ use nom::{ number::complete::be_u16, }; -use java_constants::MethodAccessFlags; +use jvm_types::MethodAccessFlags; use crate::{attribute::AttributeInfo, constant_pool::ConstantPoolItem}; diff --git a/classfile/src/validation.rs b/classfile/src/validation.rs index b017351a..82345f92 100644 --- a/classfile/src/validation.rs +++ b/classfile/src/validation.rs @@ -1,6 +1,6 @@ use alloc::collections::BTreeMap; -use java_constants::MethodAccessFlags; +use jvm_types::MethodAccessFlags; use crate::{AttributeInfo, ClassFileError, ClassInfo, ConstantPoolReference, constant_pool::ConstantPoolItem}; diff --git a/classfile/tests/test.rs b/classfile/tests/test.rs index d01ac510..6b54a5cd 100644 --- a/classfile/tests/test.rs +++ b/classfile/tests/test.rs @@ -1,12 +1,12 @@ use std::collections::BTreeMap; -use java_constants::ClassAccessFlags; +use jvm_types::ClassAccessFlags; use classfile::{AttributeInfo, ClassFileError, ClassInfo, ConstantPoolReference, Opcode}; #[test] fn test_hello() { - let hello = include_bytes!("../../test_data/Hello.class"); + let hello = include_bytes!("../../test-data/Hello.class"); let class = ClassInfo::parse(hello).unwrap(); @@ -57,7 +57,7 @@ fn test_hello() { #[test] fn test_odd_even() { - let odd_even = include_bytes!("../../test_data/OddEven.class"); + let odd_even = include_bytes!("../../test-data/OddEven.class"); let class = ClassInfo::parse(odd_even).unwrap(); @@ -85,7 +85,7 @@ fn test_odd_even() { #[test] fn test_superclass() { - let super_class = include_bytes!("../../test_data/SuperClass.class"); + let super_class = include_bytes!("../../test-data/SuperClass.class"); let class = ClassInfo::parse(super_class).unwrap(); @@ -98,7 +98,7 @@ fn test_superclass() { #[test] fn test_switch() { - let super_class = include_bytes!("../../test_data/Switch.class"); + let super_class = include_bytes!("../../test-data/Switch.class"); let class = ClassInfo::parse(super_class).unwrap(); @@ -128,7 +128,7 @@ fn test_switch_rejects_entry_counts_larger_than_remaining_input() { #[test] fn test_invokeinterface() { - let interface = include_bytes!("../../test_data/Interface.class"); + let interface = include_bytes!("../../test-data/Interface.class"); let class = ClassInfo::parse(interface).unwrap(); @@ -147,7 +147,7 @@ fn test_invokeinterface() { #[test] fn test_malformed_class_files_return_structured_errors() { - let hello = include_bytes!("../../test_data/Hello.class"); + let hello = include_bytes!("../../test-data/Hello.class"); assert_eq!(ClassInfo::parse(&[]).err(), Some(ClassFileError::InvalidFormat)); @@ -179,7 +179,7 @@ fn test_malformed_class_files_return_structured_errors() { #[test] fn test_class_info_validation_rejects_invalid_names_descriptors_and_code_layout() { - let hello = include_bytes!("../../test_data/Hello.class"); + let hello = include_bytes!("../../test-data/Hello.class"); let mut invalid_name = ClassInfo::parse(hello).unwrap(); invalid_name.this_class = "[I".to_string().into(); @@ -196,5 +196,5 @@ fn test_class_info_validation_rejects_invalid_names_descriptors_and_code_layout( #[test] fn test_array_clone_method_owner_is_a_valid_class_constant() { - assert!(ClassInfo::parse(include_bytes!("../../test_data/Array.class")).is_ok()); + assert!(ClassInfo::parse(include_bytes!("../../test-data/Array.class")).is_ok()); } diff --git a/docs/upstream-sync-approach.md b/docs/upstream-sync-approach.md index 456877be..12694a2f 100644 --- a/docs/upstream-sync-approach.md +++ b/docs/upstream-sync-approach.md @@ -545,6 +545,91 @@ upstream 이 `invoke_virtual` 시그니처를 바꾸자 ★**«우리 고유 테 그것은 **S8**(총괄 보류분 `2026-09-03-upstream-sync-s5-s7-remeasure#p0`)의 몫이다 — 이 회차는 **집행하지 않았다**. +### ★★★[2026-09-04] S8 착지 기록 — **개명 스윕** · ★**behind 12 → 0**(upstream 완전 따라잡음) + +**착수 재측정**(신 서식): 컷 `bd42427` = ★**누적 8 · 델타 +8**(base `3fb08a8` · merge-base `ba5797b`). +★**「재서 8 이었다」** — 그 12커밋은 전부 **crates.io 공개 준비**(크레이트 개명) 스윕이다. + +### 개명 대응표 — ★upstream 이력에서 «떴다»(추측 0) + +`git diff --find-renames --name-status ba5797b upstream/main` ⇒ 상태 분포 ★**R 642 · M 22 · A/D 0**. + +| 전 | 후 | 건수 | 최소 유사도 | +|---|---|---|---| +| `java_runtime/` | ★**`rustjava-runtime/`** | 379 | R079 | +| `test_data/` | ★**`test-data/`** | 243 | R083 | +| `jvm_rust/` | `jvm-bytecode/` | 12 | R066 | +| `java_class_proto/` | `jvm-class-proto/` | 4 | R056 | +| `java_constants/` | `jvm-types/` | 2 | R061 | +| `test_utils/` | `test-utils/` | 2 | R061 | + +★**`java_runtime` 은 «2홉»이다**: `7b966e7`(→`java-runtime` · R100 399/399) → `653f543`(→`rustjava-runtime`). +★**미확인 0** — 상태 분포에 **A/D 가 0** 이므로 「표에 없는 경로」가 없다(upstream 은 **아무것도 지우지 않았다**). +★**유사도가 낮은 셋**(R056·R061)은 `Cargo.toml`·`lib.rs` 처럼 **패키지명 자체가 본문에 든 파일**이라 낮게 나온 것이고, +같은 디렉터리의 나머지가 R100 이라 «삭제+신규»가 아니다. + +### ★★픽스처 판정 — modify/delete 가 **«0건»이었다**(위험 예측이 «좋은 쪽»으로 빗나갔다) + +★**이 회차가 두려워한 형태는 나오지 않았다.** git 이 `CONFLICT (file location)` + **`AU`** 로 처리해 +우리 고유 파일을 **새 경로로 «이미 옮겨» 두고 «이동 확인»만 요구**했다. ⇒ **`DU`/`UD`/`DD` 0건.** + +| # | 파일(새 경로) | 기원 | 처분 | 근거 | +|---|---|---|---|---| +| 1 | `rustjava-runtime/src/charset.rs` | ★**우리**(PR #5 `7fd0ad8`) | ★**간다** | upstream 에 대응물 **없음** — 대체되지 않았다 | +| 2 | `test-data/TimeApi.class` | ★**우리**(PR #2 `13ab950`) | ★**간다** | 〃 | +| 3 | `test-data/TimeApi.txt` | ★**우리**(PR #2) | ★**간다** | 〃 | +| 4 | `test-data/UnsupportedCharset.class` | ★**우리**(PR #5) | ★**간다** | 〃 | +| 5 | `test-data/UnsupportedCharset.txt` | ★**우리**(PR #5) | ★**간다** | 〃 | +| 6 | `test-data/src/UnsupportedCharset.java` | ★**우리**(PR #5) | ★**간다** | 〃 | + +★**「남는다/버린다」는 하나도 없다** — 여섯 다 **우리 것**이고 upstream 판본으로 **대체된 것이 없다** +(「우리 것이면 지우지 마라」가 기본값이고, 지울 근거가 나오지 않았다). +★★**보존 증명은 «블롭»으로 했다** — `origin/main:<옛 경로>` 블롭 ↔ 새 경로 `hash-object` 가 **6건 전부 동일**. +★**픽스처 수 5 → 5** · 옛 디렉터리 **6개 전부 소멸**(개명 완료). + +### ★★개명이 «우리 자산 2건»을 낡게 만들었다 — 「우리 자산이 낡는」 **5회째** + +★**축은 S7 과 같은 방향**(upstream 변경 → 우리 파일이 낡음)인데 **대상이 처음**이다 — **CI 설정과 경로 문자열**: + +| 자산 | 무엇이 낡았나 | 처분 | +|---|---|---| +| `.github/workflows/rust.yml:55` | `--exclude test_utils` 가 **옛 크레이트 이름** ⇒ wasm32 셀이 깨진다(★실측: 옛 이름 **rc=101** ↔ 새 이름 **rc=0**) | `test-utils` 로 | +| `tests/test_class_format.rs`(PR #3) | `"test_data/Hello.class"` **경로 문자열 4곳** | `test-data/` 로 | + +★**둘 다 «우리 파일»이라 충돌이 «날 수가 없다»** — 개명 대응표를 그대로 적용했을 뿐이고 **upstream 코드는 안 건드렸다**. +★**전례**: S3 3건 → S5 5곳 → S6 3곳 → S7 5곳(공용 API) → ★**S8 2건(CI·경로)**. +⇒ ★**이제 방향이 셋이다**: ⑴upstream 신규 파일 ⑵upstream 공용 API 변경 ⑶★**upstream 개명**. +★**⑶은 컴파일이 «절반만» 잡는다** — `test_class_format.rs` 는 런타임 실패이고 `rust.yml` 은 **CI 에서만** 드러난다. + +### ★`Cargo.lock` — 계약6⒞ 가 «또» 잡았다(S5 와 같은 형태) + +`--theirs` + `cargo build` 가 ★**3개를 «내렸다»**: `tracing` **0.1.44 → 0.1.41** · +`tracing-subscriber` 0.3.23 → 0.3.20 · `syn` 3.0.4 → 3.0.2. +★★**`tracing` 하강은 PR #4 를 되돌리는 것이다** — 그 PR 의 산출물이 정확히 +「`tracing-attributes` 상한 핀 제거 ⇒ tracing **0.1.41 → 0.1.44 언프리즈**」였다(upstream `bd42427` 의 lock 은 **0.1.41**). +⇒ **처방은 S5 와 같다**: `origin/main` 의 lock 에서 출발해 다시 `cargo build` +⇒ ★**내려간 것 0** · `tracing` **0.1.44 유지** · `tracing-attributes` **부재 유지**. +남는 변화는 **워크스페이스 멤버 개명**(6 제거 / 6 추가)과 `classfile`·`jvm` **0.0.1 → 0.1.1**(upstream 이 올린 판 번호)뿐이다. + +### `thread.rs` — 유일 내용 충돌 · «직교» 합집합 + +upstream 은 크레이트 개명 import(`java_class_proto`→`jvm_class_proto` · `java_constants`→`jvm_types`), +우리는 PR #4 의 `use tracing::Instrument;` ⇒ ★**의미가 겹치지 않는다** ⇒ 합집합. 수동 span 2요소 **생존**. + +### green · 착지 실측 + +stable 4종 + ★beta 2종 **전건 rc=0** · `cargo test --all` ★**554 / 0 / 1** · beta 도 **554 동수**. +★**증감 0 이고 그것이 맞다** — upstream 테스트 함수도 `ba5797b` **547** → `bd42427` **547**(개명 스윕이라 추가 0). +★약화 0: `#[ignore]` **1 → 1** · 우리 테스트 함수 **558 → 558**. +우리 자산 전수 생존: `charset.rs` 1 · `Charset::` 4곳 · 수동 span 2 · `tracing-attributes` **0** · +`setProperty` `String` 6곳 · `double_must_use` allow **9곳** · 픽스처 **5** · `test_class_format.rs` **4/4**. + +★★**계보**: `merge-base origin/main upstream/main` ★**`ba5797b` → `bd42427`** · +behind ★**12 → 0** · 머지커밋 **부모 2개**(`3fb08a8` + `bd42427`). +⇒ ★★★**upstream 을 «완전히» 따라잡았다.** ★`--squash` 였다면 부모가 접히며 `merge-base` 가 `ba5797b` 로 +되돌아가고 behind 가 **0 → 12** 였다. + + ★**S1~S3 이 이 동기화의 «전부»다** — 세 회차가 판단을 다 쓰고, 각각 **한 축씩만** 다룬다. 검수자가 한 회차에서 읽어야 하는 것은 **우리 해소분**이지 upstream 원본 diff 가 아니다: diff --git a/docs/worklog/2026-09-04-upstream-sync-s8.json b/docs/worklog/2026-09-04-upstream-sync-s8.json new file mode 100644 index 00000000..50985ca5 --- /dev/null +++ b/docs/worklog/2026-09-04-upstream-sync-s8.json @@ -0,0 +1,59 @@ +{ + "schema": 1, + "date": "2026-09-04", + "title": "upstream 동기 S8 — 컷 bd42427 개명 스윕 판정 · 우리 픽스처 5/5 바이트 보존 · behind 12 → 0", + "services": [ + "RustJava" + ], + "taskId": "rustjava-upstream-sync-s8-rename-sweep-decision", + "summary": "upstream bd42427 까지 12커밋(crates.io 공개 준비 개명 스윕)을 --merge 로 흡수하고 충돌 8건을 해소했다. merge-base ba5797b → bd42427 · behind 12 → 0 · 부모 2개 ⇒ upstream 을 «완전히» 따라잡았다(2026-08-16 계획 착수 시 behind 33). 착수 재측정(신 서식): 누적 8 · 델타 +8(base 3fb08a8 · merge-base ba5797b) — 「재서 8 이었다」. 개명 대응표는 upstream 이력에서 실측으로 떴다(git diff --find-renames ba5797b upstream/main ⇒ R 642 · M 22 · A/D 0): java_runtime→rustjava-runtime(2홉 · 379건 최소 R079) · test_data→test-data(243 R083) · jvm_rust→jvm-bytecode(12 R066) · java_class_proto→jvm-class-proto(4 R056) · java_constants→jvm-types(2 R061) · test_utils→test-utils(2 R061). A/D 가 0 이므로 표에 없는 경로가 없고 「미확인」 0건이다. ★이 회차가 두려워한 modify/delete 는 0건이었다 — git 이 CONFLICT (file location) + AU 로 우리 고유 6건을 새 경로로 이미 옮겨 두고 이동 확인만 요구했다. 처분은 「간다」 전건이고(여섯 다 우리 것이며 upstream 판본으로 대체된 것이 없다) origin/main 블롭 ↔ 새 경로 hash-object 대조로 6건 전부 바이트 동일을 확인했다. 픽스처 수 5 → 5. 대신 개명이 우리 자산 2건을 낡게 만들었다(「우리 자산이 낡는」 5회째이고 대상은 처음 — CI 설정과 경로 문자열): .github/workflows/rust.yml 의 --exclude test_utils 가 옛 크레이트 이름이라 wasm32 셀이 깨지고(실측 rc=101 ↔ 새 이름 rc=0), tests/test_class_format.rs 의 \"test_data/\" 경로 4곳이 낡았다. 둘 다 우리 파일이라 충돌이 날 수가 없다. 그리고 Cargo.lock 이 --theirs+build 로 tracing 0.1.44 → 0.1.41 을 포함해 3개를 내렸는데, tracing 하강은 PR #4(tracing-attributes 상한 핀 제거 = 언프리즈)를 되돌리는 것이라 S5 처방(origin/main lock 에서 재생성)으로 막았다.", + "changes": [ + "git merge bd42427 --no-ff — 머지커밋 부모 2개. merge-base origin/main upstream/main ba5797b → bd42427 · behind 12 → 0. -s ours 는 쓰지 않았다(S5 이후 4회 연속 불필요).", + "우리 고유 6건의 «경로 이전» 확인 — rustjava-runtime/src/charset.rs · test-data/TimeApi.{class,txt} · test-data/UnsupportedCharset.{class,txt} · test-data/src/UnsupportedCharset.java. 내용 무접촉(이동 확인만) · origin/main 블롭과 바이트 동일.", + ".github/workflows/rust.yml — --exclude test_utils → test-utils(+ 주석). 개명으로 낡은 «우리 CI 설정»이고, 그대로 두면 wasm32 셀이 red 다(실측 rc=101).", + "tests/test_class_format.rs — \"test_data/\" 경로 문자열 4곳을 test-data/ 로(PR #3 픽스처 참조 경로).", + "rustjava-runtime/src/classes/java/lang/thread.rs — 유일 내용 충돌(import 블록)을 «직교» 합집합으로 해소. upstream 크레이트 개명 import 2줄 + 우리 tracing::Instrument. 수동 span 2요소 생존.", + "Cargo.lock — 재생성을 «다시» 했다. --theirs+build 는 tracing 0.1.44 → 0.1.41(PR #4 언프리즈 되돌림) · tracing-subscriber 0.3.23 → 0.3.20 · syn 3.0.4 → 3.0.2 로 내린다. origin/main lock 에서 출발해 cargo build ⇒ 내려간 것 0 · tracing 0.1.44 유지 · tracing-attributes 부재 유지.", + "docs/upstream-sync-approach.md §5 — 「[2026-09-04] S8 착지 기록」 절 신설(개명 대응표 · 픽스처 판정표 · modify/delete 0 · 우리 자산 2건 낡음 · Cargo.lock 하강 차단 · 계보 4축). 과거 기록 소급 수정 0.", + "STATE.md · REPORT.md · docs/worklog/2026-09-04-upstream-sync-s8.{md,json} 갱신·신설." + ], + "deploy": { + "sha": "", + "urls": [] + }, + "verification": "착수 실측: base = origin/main 3fb08a8 · merge-base ba5797b8eb4cf376fdd63129903d319d1d7acf98 · behind 12 · 열린 PR 0. 착수 재측정(신 서식): git merge-tree --write-tree --name-only origin/main bd42427 = 누적 8 · 직전 컷 ba5797b 누적 0 ⇒ 델타 +8. 착수 baseline cargo test --all = 554 passed / 0 failed / 1 ignored · #[ignore] 1 · 우리 테스트 함수 558 · 우리 픽스처 5. 개명 대응표: git diff --find-renames --name-status ba5797b upstream/main ⇒ 상태 분포 R 642 · M 22 · A/D 0(그래서 「미확인」 0건) · 최상위 대응 6쌍과 각 최소 유사도는 회신 표 그대로. 2홉 확인: 7b966e7 java_runtime→java-runtime(R100 399/399) · 653f543 java-runtime→rustjava-runtime(R100 307/379). 병합 실측: CONFLICT (file location) 6건 + content 2건(thread.rs · Cargo.lock) · ★DU/UD/DD 0건. 픽스처 보존 증명: origin/main:<옛 경로> 블롭 ↔ 새 경로 git hash-object 가 6건 전부 동일(0199513a · 5a394ad6 · b10f2546 · b8748f08 · 89833293 · 4ecd8f4f) · 픽스처 수 5 → 5 · 옛 디렉터리 6개 전부 소멸. 낡은 우리 자산 실측: cargo clippy --workspace --exclude test_utils --target wasm32-unknown-unknown rc=101 ↔ --exclude test-utils rc=0. Cargo.lock 대조(--theirs 판): 내려간 것 3(tracing 0.1.44→0.1.41 · tracing-subscriber 0.3.23→0.3.20 · syn 3.0.4→3.0.2) ⇒ 재생성 후 내려간 것 0 · tracing 0.1.44 · tracing-attributes 부재. 착지 후: merge-base = bd42427fea794dd3f4ee93194c4d990d1ef693ae · behind 0 · git log -1 --format=%p = 3fb08a8 bd42427(부모 2개). green: stable 4종 rc=0 + beta 2종 rc=0 · cargo test --all = 554 passed / 0 failed / 1 ignored · cargo +beta test --all 도 554 동수. 시험 수 증감 0 의 출처: upstream 테스트 함수도 ba5797b 547 → bd42427 547(개명 스윕이라 추가 0). 약화 0: #[ignore] 1 → 1 · 우리 테스트 함수 558 → 558. 우리 자산 생존: charset.rs 1 · Charset:: 4곳 · 수동 span 2곳 · tracing-attributes 0 · setProperty String 6곳 · double_must_use allow 9곳 · 픽스처 5 · tests/test_class_format.rs 4/4. python3 scripts/check-worklog-json.py rc=0.", + "issues": [ + "★★티켓 계약3 의 전제가 어긋났다 — charset.rs·test_string.rs 의 «내용 충돌»을 요구했으나 실측은 다르다: charset.rs 는 위치 충돌뿐이고(upstream 에 그 파일이 없어 내용이 갈릴 수가 없다) test_string.rs 는 자동 병합됐다. 실제 내용 충돌은 thread.rs 하나였고 그것을 ⒜⒝⒞ 로 답했다.", + "★★이 회차가 두려워한 modify/delete 는 0건이었다 — git 의 디렉터리 rename 탐지가 우리 고유 파일을 새 경로로 자동으로 옮기고 CONFLICT (file location) 로 «이동 확인»만 요구했다. 위험 예측이 좋은 쪽으로 빗나간 것이고, 그 사실을 숨기지 않는다. 다만 이것은 «이번 개명이 R079 이상으로 깨끗했기 때문»이고 유사도가 낮은 개명에서는 여전히 modify/delete 가 날 수 있다.", + "★★「우리 자산이 낡는」 5회째이고 이번에 세 번째 방향이 드러났다: ⑴upstream 신규 파일(S3·S5·S6) ⑵공용 API 변경(S7) ⑶★개명(S8). ⑶은 컴파일이 절반만 잡는다 — 경로 문자열은 런타임 실패이고 CI 설정은 CI 에서만 드러난다. 이번엔 내가 wasm32 축을 직접 쳐서 잡았지만 그것은 «기억»이지 그물이 아니다.", + "★Cargo.lock 하강이 S5 에 이어 두 번째다 — 이번엔 tracing 0.1.44 → 0.1.41 이고 그것은 PR #4 의 언프리즈를 되돌리는 것이었다. 두 번 다 처방이 같다(우리 lock 에서 출발해 재생성) ⇒ 개명·의존 변경이 큰 컷에서는 --theirs 를 쓰지 말고 처음부터 우리 lock 에서 재생성하는 것이 맞다.", + "★behind 가 0 이 됐다 — 다음 동기 회차는 「계획된 컷」이 아니라 「upstream 이 움직일 때」다. 정기 축이 필요한지는 별건 판정이고 이 회차가 정하지 않았다.", + "머지하지 않았다 — 게이트②·③은 별 세션이다. ★게이트③이 --squash 면 merge-base 가 ba5797b 로 되돌아가고 behind 가 0 → 12 가 된다: -merge 티켓에 merge_strategy: merge 필수(bin/queue-lint 검사22). upstream 발신 0.", + "★[게이트③ 2026-09-04] PR #24 를 ★--merge 로 착지시켰다(★--squash 아님 — 등재 repo). 검수 핀 544addf9 · ★동봉 «전» head 가 핀과 일치(무이동)했고 원장 동봉으로 head 가 한 번 움직였다 — 전/후 sha 는 회신에 있다(계약 2-b 가 명시 승인한 이동이지 «핀 이동»이 아니다). ★git fetch upstream 을 «먼저» 쳐서 낡은 ref 로 잰 «거짓 0» 을 막았다. ★★이 착지가 캠페인 종료다 — 2026-08-16 착수 시 behind 33 → 0 · S1~S8 컷 조상 8/8." + ], + "proposals": [ + { + "title": "「우리 자산이 낡는」 축을 회차 계약에 넣을지 판정하라 — 다섯 회차 미처분이고 방향이 셋으로 늘었다", + "plainSummary": "우리가 원본과 다르게 만들어 둔 것들이 원본이 움직일 때마다 조용히 어긋난다. 어긋나는 방식이 이제 세 가지로 확인됐는데, 그중 두 가지는 지금 아무도 자동으로 확인하지 않는다.", + "userBenefit": "동기화 회차가 「충돌 다 풀었다」로 끝났는데 실제로는 우리 기능이 깨진 채 넘어가는 일이 사라진다. 지금은 사람이 기억하거나 우연히 테스트·컴파일이 덮을 때만 잡힌다.", + "why": "같은 형태가 다섯 번 났고 방향이 셋이다. ⑴upstream 이 신규 파일을 들여와 우리 규격을 안 지킨다(S3 test_class_format.rs 3건 · S5 io 테스트 5곳 · S6 regex 테스트 3곳) — merge-tree 도 교집합 대조도 못 보고 「자산 서술자 전 트리 grep」만 통했다. ⑵upstream 이 공용 API 시그니처를 바꿔 우리 파일이 낡는다(S7 우리 고유 테스트 5곳) — 컴파일이 그물이다. ⑶upstream 이 개명해 우리 CI 설정·경로 문자열이 낡는다(S8 rust.yml · test_class_format.rs) — 컴파일이 절반만 잡는다(경로는 런타임, CI 설정은 CI 에서만). ⇒ 그물이 없는 것은 ⑴과 ⑶의 절반이다. 현재 알려진 자산은 System.setProperty 서술자 · ClassFormatError 종류 단정 · charset 라우팅 · 수동 span · CI 워크플로의 크레이트 이름 · 픽스처 경로 문자열 여섯 축이다.", + "tradeoff": "⑴자산 목록 + grep 스니펫을 §4 에 적고 회차 계약에 「머지 후 재확인」을 넣으면 싸지만(명령 몇 줄) 목록을 사람이 유지해야 하고 새 자산이 생길 때 갱신을 잊으면 다시 샌다. ⑵기계 잠금(자산을 고정하는 테스트)을 만들면 확실하나 새 도구이고 upstream 이 그 자리를 만질 때마다 손이 간다. ⑶현상 유지면 ⑴과 ⑶은 계속 사람의 기억에 의존한다 — 다섯 번 다 잡히긴 했으나 S5 는 정독이 아니라 테스트가 잡았고 S8 의 CI 축은 내가 우연히 직접 쳐서 잡았다.", + "effort": "S — ⑴이면 §4 에 자산 6축 목록 + grep 스니펫 한 곳. 판정 자체는 XS.", + "target": "docs/upstream-sync-approach.md §4 · 회차 티켓 템플릿" + }, + { + "title": "behind 0 이 됐다 — upstream 동기를 «정기 축»으로 둘지 판정하라", + "plainSummary": "원본 저장소를 완전히 따라잡았다. 이제 다음에 언제 다시 받아올지가 정해져 있지 않아서, 아무도 챙기지 않으면 격차가 다시 벌어진다.", + "userBenefit": "격차가 작을 때 받아오면 충돌이 작고 우리 기능이 삼켜질 위험도 작다. 이번 리니지가 behind 33 에서 시작해 여덟 회차가 걸린 것이 그 반대 사례다.", + "why": "2026-08-16 계획이 세운 7회차(S1~S7)와 추가된 S8 이 오늘 모두 착지해 behind 가 0 이다. 계획서 §5 는 「어느 컷을 언제」를 정했지만 「따라잡은 뒤」를 정하지 않았다. 그리고 이 리니지의 비용 대부분은 「격차가 커진 뒤 한꺼번에 받은 것」에서 나왔다 — S5 는 설계 판단 1건, S8 은 개명 스윕 판정이 필요했고, 둘 다 격차가 작았으면 훨씬 쌌다.", + "tradeoff": "⑴정기 축(예: 월 1회 또는 behind 임계)으로 두면 회차가 작아지지만 발권·검수 비용이 상시로 든다. ⑵필요할 때만 받으면 비용이 0 이지만 격차가 다시 33 이 될 수 있고, 그때는 이번처럼 여덟 회차가 든다. ⑶behind 를 재는 것만 자동화하고 발권은 사람이 하면 중간이지만, 재는 기구가 지금 없다.", + "effort": "XS — 판정. 정기 축을 고르면 그 축의 발권 방식은 별건.", + "target": "docs/upstream-sync-approach.md · 총괄 발권 정책" + } + ], + "resolvedIssues": [], + "adoptedProposals": [ + "2026-09-03-upstream-sync-s5-s7-remeasure#p0" + ], + "declinedProposals": [] +} diff --git a/docs/worklog/2026-09-04-upstream-sync-s8.md b/docs/worklog/2026-09-04-upstream-sync-s8.md new file mode 100644 index 00000000..c3c60191 --- /dev/null +++ b/docs/worklog/2026-09-04-upstream-sync-s8.md @@ -0,0 +1,153 @@ +# [2026-09-04] upstream 동기 S8 — 개명 스윕 판정 · ★**behind 12 → 0** + +**티켓**: `rustjava-upstream-sync-s8-rename-sweep-decision` +**채택 제안**: `2026-09-03-upstream-sync-s5-s7-remeasure#p0` +**컷**: `bd42427fea794dd3f4ee93194c4d990d1ef693ae`(**12커밋** · crates.io 공개 준비 개명 스윕) + +⇒ ★★★**upstream 을 «완전히» 따라잡았다** — 2026-08-16 계획 착수 시 behind **33** → 오늘 **0**. + +--- + +## 1. 착수 재측정 (신 서식) + +> 컷 `bd42427` 충돌 = ★**누적 8 · 델타 +8**(base `3fb08a8` · merge-base `ba5797b`) + +★**「재서 8 이었다」.** 12커밋은 전부 **공개 준비 개명**이다 +(`Rename crates for publication` · `Align crate directories with package names` · +`Rename test data directory` · `Rename Java runtime crate` · `Remove test-util from workspace` 등). + +## 2. ★개명 대응표 — upstream 이력에서 «떴다»(추측 0) + +`git diff --find-renames --name-status ba5797b upstream/main` ⇒ ★**R 642 · M 22 · A/D 0**. + +| 전 | 후 | 건수 | 최소 유사도 | +|---|---|---|---| +| `java_runtime/` | ★**`rustjava-runtime/`** | 379 | R079 | +| `test_data/` | ★**`test-data/`** | 243 | R083 | +| `jvm_rust/` | `jvm-bytecode/` | 12 | R066 | +| `java_class_proto/` | `jvm-class-proto/` | 4 | R056 | +| `java_constants/` | `jvm-types/` | 2 | R061 | +| `test_utils/` | `test-utils/` | 2 | R061 | + +★**`java_runtime` 은 «2홉»이다**: `7b966e7`(→`java-runtime` · **R100 399/399**) → `653f543`(→`rustjava-runtime` · R100 307/379). +★**「없다」가 아니라 실측이다** — 상태 분포에 ★**A/D 가 0** 이므로 **표에 없는 경로가 없다**(upstream 은 아무것도 지우지 않았다). +⇒ ★**「미확인」으로 남길 경로 0건.** +★**유사도가 낮은 셋(R056·R061)은 «삭제+신규»가 아니다** — `Cargo.toml`·`lib.rs` 처럼 **패키지명이 본문에 든 파일**이라 +낮게 나온 것이고, 같은 디렉터리의 나머지가 R100 이다. + +## 3. ★★픽스처 판정 — modify/delete 가 **«0건»이었다** + +★**이 회차가 두려워한 형태가 «나오지 않았다».** git 이 **`CONFLICT (file location)`** + **`AU`** 로 처리해 +우리 고유 파일을 **새 경로로 «이미 옮겨» 두고 «이동 확인»만 요구**했다. +⇒ 병합 중 **`DU`/`UD`/`DD` 0건**. + +| # | 파일(새 경로) | ⒜ 기원 | ⒝ 새 경로 | ⒞ 처분 · 왜 | +|---|---|---|---|---| +| 1 | `rustjava-runtime/src/charset.rs` | ★**우리** — PR #5 `7fd0ad8` | `java_runtime/src/` → `rustjava-runtime/src/` | ★**간다** — upstream 에 **대응물 없음**(대체되지 않았다) | +| 2 | `test-data/TimeApi.class` | ★**우리** — PR #2 `13ab950` | `test_data/` → `test-data/` | ★**간다** — 〃 | +| 3 | `test-data/TimeApi.txt` | ★**우리** — PR #2 | 〃 | ★**간다** — 〃 | +| 4 | `test-data/UnsupportedCharset.class` | ★**우리** — PR #5 | 〃 | ★**간다** — 〃 | +| 5 | `test-data/UnsupportedCharset.txt` | ★**우리** — PR #5 | 〃 | ★**간다** — 〃 | +| 6 | `test-data/src/UnsupportedCharset.java` | ★**우리** — PR #5 | `test_data/src/` → `test-data/src/` | ★**간다** — 〃 | + +★**「남는다/버린다」는 하나도 없다.** 「우리 것이면 지우지 마라」가 기본값이고, +★**지울 근거(= upstream 판본으로 대체됐음)가 «한 건도» 나오지 않았다** — upstream 트리에 대응 파일이 없다. + +★★**보존 증명은 «블롭»으로 했다**(「존재한다」가 아니라 「같다」): +`origin/main:<옛 경로>` 의 블롭 ↔ 새 경로 `git hash-object` ⇒ ★**6건 전부 동일** +(`0199513a` · `5a394ad6` · `b10f2546` · `b8748f08` · `89833293` · `4ecd8f4f`). +★**우리 픽스처 수: 전 5 → 후 5** · 옛 디렉터리 **6개 전부 소멸**(개명 완료). + +## 4. ★★개명이 «우리 자산 2건»을 낡게 만들었다 — 「우리 자산이 낡는」 **5회째** + +★**축은 S7 과 같은 방향**(upstream 변경 → 우리 파일이 낡음)이나 ★**대상이 처음**이다 — **CI 설정과 경로 문자열**. + +| 자산 | 무엇이 낡았나 | 처분 | +|---|---|---| +| `.github/workflows/rust.yml:55` | `--exclude test_utils` 가 **옛 크레이트 이름** ⇒ wasm32 셀이 깨진다 | `test-utils` 로(주석도) | +| `tests/test_class_format.rs`(PR #3) | `"test_data/Hello.class"` **경로 문자열 4곳** | `test-data/` 로 | + +★**실측으로 확정했다**(문면 추측 아님): +`cargo clippy --workspace --exclude test_utils --target wasm32-unknown-unknown` → ★**rc=101** ↔ +`--exclude test-utils` → ★**rc=0**. +★**둘 다 «우리 파일»이라 충돌이 «날 수가 없다»** — 개명 대응표를 그대로 적용했을 뿐이고 **upstream 코드는 무접촉**이다. + +★★**전례를 이어 붙이면 방향이 «셋»이 된다**: + +| 회차 | 방향 | 무엇이 잡나 | +|---|---|---| +| S3 · S5 · S6 | upstream **신규 파일**이 우리 규격 미준수 | 정독 / 자산 grep / 테스트 | +| S7 | upstream **공용 API 변경**으로 우리 파일이 낡음 | 컴파일 | +| ★**S8** | upstream **개명**으로 우리 **CI·경로 문자열**이 낡음 | ★**컴파일이 «절반만»** — 경로는 런타임, CI 설정은 **CI 에서만** | + +## 5. `charset.rs`·`test_string.rs` — ★**티켓 계약 3 의 전제가 어긋났다**(정직 고지) + +티켓은 이 둘의 **내용 충돌** 해소를 요구했으나 **실측은 다르다**: +- `charset.rs` — ★**위치 충돌뿐**(`AU`). ★**내용 충돌 0** — upstream 에 그 파일이 **없으므로**(순수 우리 것) 내용이 갈릴 수가 없다. +- `test_string.rs` — ★**자동 병합**됐다(상태 `A ` = rename 경유 스테이지). 충돌 0. + +⇒ ★**⒜⒝⒞ 형식으로 답할 «내용 충돌»이 이 둘엔 없었다.** 실제 내용 충돌은 **`thread.rs` 하나**이고 §6 이 그것이다. + +## 6. `thread.rs` — 유일 내용 충돌 · «직교» 합집합 + +| | 한 일 | +|---|---| +| ⒜ upstream(**+3/−3**) | 크레이트 개명 import — `java_class_proto`→`jvm_class_proto` · `java_constants`→`jvm_types` | +| ⒝ 우리 | PR #4 의 `use tracing::Instrument;`(수동 span) | + +⒞ ★**직교다** — 한쪽은 «개명된 크레이트를 가리키는 import», 다른 쪽은 «span 트레이트 import» 로 **의미가 겹치지 않는다** +⇒ **합집합**. **수동 span 2요소 생존**(`info_span!` + `.instrument(span)`). + +## 7. ★`Cargo.lock` — 계약6⒞ 가 «또» 잡았다(S5 와 같은 형태) + +`git checkout --theirs Cargo.lock` + `cargo build` 가 ★**3개를 «내렸다»**: + +| 크레이트 | 우리 | upstream 쪽으로 내려감 | +|---|---|---| +| ★`tracing` | **0.1.44** | **0.1.41** | +| `tracing-subscriber` | 0.3.23 | 0.3.20 | +| `syn` | 3.0.4 | 3.0.2 | + +★★**`tracing` 하강은 PR #4 를 «되돌리는» 것이다** — 그 PR(`fa92ef9`)의 산출물이 정확히 +「`tracing-attributes` 상한 핀 제거 ⇒ tracing **0.1.41 → 0.1.44 언프리즈**」였다(upstream `bd42427` 의 lock 은 **0.1.41**). +⇒ **처방은 S5 와 같다**: `origin/main` 의 lock 에서 출발해 다시 `cargo build` +⇒ ★**내려간 것 0** · `tracing` **0.1.44 유지** · `tracing-attributes` **부재 유지**. +남는 변화는 **워크스페이스 멤버 개명**(6 제거/6 추가)과 `classfile`·`jvm` **0.0.1 → 0.1.1**(upstream 이 올린 판 번호)뿐이다. + +## 8. green · 시험 수 증감 출처 (계약 5) + +| 명령 | stable | ★beta | +|---|---|---| +| `cargo fmt --all -- --check` | **0** | — | +| `cargo clippy --all -- -D warnings` | **0** | **0** | +| `cargo clippy --workspace --exclude test-utils --target wasm32-unknown-unknown -- -D warnings` | **0** | **0** | +| `cargo test --all` | **0** — **554 / 0 / 1** | **0** — **554 / 0 / 1** | +| `python3 scripts/check-worklog-json.py` | **0** | — | + +★**새 red 0**: baseline **554/0/1** → 착지 **554/0/1**. +★★**증감 «0» 이고 그것이 «맞다»** — upstream 테스트 함수도 `ba5797b` **547** → `bd42427` **547** +(★**개명 스윕이라 테스트 «추가»가 0** 이다). +★**약화 0**: `#[ignore]` **1 → 1** · 우리 테스트 함수 **558 → 558** · 스킵·단언 완화 **0**. + +**우리 자산 전수 생존**: `charset.rs` **1** · `Charset::` 호출부 **4곳** · 수동 span **2곳** · +`tracing-attributes` **0** · `setProperty` `String` **6곳** · `double_must_use` allow **9곳** · +픽스처 **5** · `tests/test_class_format.rs` **4/4**. + +## 9. ★계보 4축 (계약 6) + +| 축 | 값 | +|---|---| +| 머지커밋 부모 | ★**2개** — `3fb08a8` + `bd42427` | +| `merge-base origin/main upstream/main` | ★**`ba5797b` → `bd42427`** | +| behind | ★**12 → 0** | +| `-s ours` | **쓰지 않았다**(S5 이후 **4회 연속** 불필요) | + +★★**반증 계산(S7 에서 물려받았다)**: `--squash` 였다면 부모가 접히며 `merge-base` 가 **`ba5797b` 로 되돌아가고** +behind 가 ★**0 → 12** 였다. ⇒ **스쿼시의 대가가 «수»로 보인다.** + +## 10. 경계 준수 + +머지 **0**(PR 제출까지) · 새 PR **1**(base `main` · 스택 아님) · force-push **0** · 리베이스 **0** · +`main` 직접 push **0** · ★**S9 이후 앞당김 0**(behind 0 이라 앞당길 것도 없다) · +upstream 코드 «개선» **0**(수렴만 — 고친 2건은 **우리 자산**이다) · ★**§5 과거 기록 소급 수정 0** · +시크릿 출력 **0** · upstream 발신 **0** · 맨 `grep` **0**(전건 `/usr/bin/grep`). diff --git a/jvm_rust/Cargo.toml b/jvm-bytecode/Cargo.toml similarity index 66% rename from jvm_rust/Cargo.toml rename to jvm-bytecode/Cargo.toml index 3f5828e4..bd884994 100644 --- a/jvm_rust/Cargo.toml +++ b/jvm-bytecode/Cargo.toml @@ -1,8 +1,10 @@ [package] -name = "jvm_rust" +name = "jvm-bytecode" +description = "JVM class and bytecode support for the jvm crate" version.workspace = true edition.workspace = true license.workspace = true +repository.workspace = true [dependencies] async-recursion = { workspace = true } @@ -13,6 +15,6 @@ parking_lot = { workspace = true } tracing = { workspace = true } classfile = { workspace = true } -java_class_proto = { workspace = true } -java_constants = { workspace = true } jvm = { workspace = true } +jvm-class-proto = { workspace = true } +jvm-types = { workspace = true } diff --git a/jvm_rust/src/array_class_definition.rs b/jvm-bytecode/src/array_class_definition.rs similarity index 100% rename from jvm_rust/src/array_class_definition.rs rename to jvm-bytecode/src/array_class_definition.rs diff --git a/jvm_rust/src/array_class_instance.rs b/jvm-bytecode/src/array_class_instance.rs similarity index 100% rename from jvm_rust/src/array_class_instance.rs rename to jvm-bytecode/src/array_class_instance.rs diff --git a/jvm_rust/src/class_definition.rs b/jvm-bytecode/src/class_definition.rs similarity index 98% rename from jvm_rust/src/class_definition.rs rename to jvm-bytecode/src/class_definition.rs index 0e411238..df58935d 100644 --- a/jvm_rust/src/class_definition.rs +++ b/jvm-bytecode/src/class_definition.rs @@ -13,9 +13,9 @@ use core::{ use parking_lot::RwLock; use classfile::{AttributeInfo, ClassInfo, ConstantPoolReference}; -use java_class_proto::JavaClassProto; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassDefinition, ClassInstance, Field, JavaType, JavaValue, Jvm, Method, Result}; +use jvm_class_proto::JavaClassProto; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ClassDefinitionError, class_instance::ClassInstanceImpl, field::FieldImpl, method::MethodImpl, verifier}; diff --git a/jvm_rust/src/class_instance.rs b/jvm-bytecode/src/class_instance.rs similarity index 100% rename from jvm_rust/src/class_instance.rs rename to jvm-bytecode/src/class_instance.rs diff --git a/jvm_rust/src/error.rs b/jvm-bytecode/src/error.rs similarity index 100% rename from jvm_rust/src/error.rs rename to jvm-bytecode/src/error.rs diff --git a/jvm_rust/src/field.rs b/jvm-bytecode/src/field.rs similarity index 94% rename from jvm_rust/src/field.rs rename to jvm-bytecode/src/field.rs index ec1842b2..866c9eb7 100644 --- a/jvm_rust/src/field.rs +++ b/jvm-bytecode/src/field.rs @@ -4,9 +4,9 @@ use alloc::{ }; use classfile::FieldInfo; -use java_class_proto::JavaFieldProto; -use java_constants::FieldAccessFlags; use jvm::Field; +use jvm_class_proto::JavaFieldProto; +use jvm_types::FieldAccessFlags; #[derive(Debug, Eq, PartialEq, Ord, PartialOrd)] struct FieldInner { diff --git a/jvm_rust/src/interpreter.rs b/jvm-bytecode/src/interpreter.rs similarity index 99% rename from jvm_rust/src/interpreter.rs rename to jvm-bytecode/src/interpreter.rs index ace52bc0..afef1fd1 100644 --- a/jvm_rust/src/interpreter.rs +++ b/jvm-bytecode/src/interpreter.rs @@ -1,3 +1,5 @@ +#![allow(clippy::double_must_use)] // temporary until https://github.com/rust-lang/rust-clippy/issues/17529 fix lands + use alloc::{boxed::Box, format, vec, vec::Vec}; use core::iter; diff --git a/jvm_rust/src/lib.rs b/jvm-bytecode/src/lib.rs similarity index 100% rename from jvm_rust/src/lib.rs rename to jvm-bytecode/src/lib.rs diff --git a/jvm_rust/src/method.rs b/jvm-bytecode/src/method.rs similarity index 96% rename from jvm_rust/src/method.rs rename to jvm-bytecode/src/method.rs index 96a3ce98..0bf39fef 100644 --- a/jvm_rust/src/method.rs +++ b/jvm-bytecode/src/method.rs @@ -10,9 +10,9 @@ use core::{ }; use classfile::{AttributeInfo, AttributeInfoCode, MethodInfo}; -use java_class_proto::JavaMethodProto; -use java_constants::MethodAccessFlags; use jvm::{JavaError, JavaType, JavaValue, Jvm, JvmCallback, Method, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::MethodAccessFlags; use crate::interpreter::Interpreter; @@ -71,7 +71,7 @@ impl MethodImpl { C: ?Sized, Context: Sync + Send + DerefMut + Deref + Clone, { - body: Box>, + body: Box>, context: Context, } diff --git a/jvm_rust/src/stack_frame.rs b/jvm-bytecode/src/stack_frame.rs similarity index 100% rename from jvm_rust/src/stack_frame.rs rename to jvm-bytecode/src/stack_frame.rs diff --git a/jvm_rust/src/verifier.rs b/jvm-bytecode/src/verifier.rs similarity index 98% rename from jvm_rust/src/verifier.rs rename to jvm-bytecode/src/verifier.rs index 01509595..44c17dd9 100644 --- a/jvm_rust/src/verifier.rs +++ b/jvm-bytecode/src/verifier.rs @@ -42,7 +42,7 @@ mod tests { #[test] fn rejects_multianewarray_dimensions_larger_than_the_array_type() { - let mut class = ClassInfo::parse(include_bytes!("../../test_data/MultiArray.class")).unwrap(); + let mut class = ClassInfo::parse(include_bytes!("../../test-data/MultiArray.class")).unwrap(); let mut changed = false; for method in &mut class.methods { for attribute in &mut method.attributes { diff --git a/java_class_proto/Cargo.toml b/jvm-class-proto/Cargo.toml similarity index 56% rename from java_class_proto/Cargo.toml rename to jvm-class-proto/Cargo.toml index 959c9c4a..a3ee2d35 100644 --- a/java_class_proto/Cargo.toml +++ b/jvm-class-proto/Cargo.toml @@ -1,12 +1,14 @@ [package] -name = "java_class_proto" +name = "jvm-class-proto" +description = "Utilities for implementing Java classes in Rust" version.workspace = true edition.workspace = true license.workspace = true +repository.workspace = true [dependencies] async-trait = { workspace = true } dyn-clone = { workspace = true } -java_constants = { workspace = true } +jvm-types = { workspace = true } jvm = { workspace = true } diff --git a/java_class_proto/src/lib.rs b/jvm-class-proto/src/lib.rs similarity index 100% rename from java_class_proto/src/lib.rs rename to jvm-class-proto/src/lib.rs diff --git a/java_class_proto/src/method.rs b/jvm-class-proto/src/method.rs similarity index 100% rename from java_class_proto/src/method.rs rename to jvm-class-proto/src/method.rs diff --git a/java_class_proto/src/proto.rs b/jvm-class-proto/src/proto.rs similarity index 96% rename from java_class_proto/src/proto.rs rename to jvm-class-proto/src/proto.rs index c403fc85..289c3c76 100644 --- a/java_class_proto/src/proto.rs +++ b/jvm-class-proto/src/proto.rs @@ -1,7 +1,7 @@ use alloc::{boxed::Box, format, string::String, vec::Vec}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{JavaError, JavaValue, Jvm}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::method::{MethodBody, MethodImpl}; diff --git a/java_constants/Cargo.toml b/jvm-types/Cargo.toml similarity index 61% rename from java_constants/Cargo.toml rename to jvm-types/Cargo.toml index 890992b0..8ed46b60 100644 --- a/java_constants/Cargo.toml +++ b/jvm-types/Cargo.toml @@ -1,8 +1,10 @@ [package] -name = "java_constants" +name = "jvm-types" +description = "Shared types for JVM implementations" version.workspace = true edition.workspace = true license.workspace = true +repository.workspace = true [dependencies] bitflags = { version = "^2.4", default-features = false } diff --git a/java_constants/src/lib.rs b/jvm-types/src/lib.rs similarity index 100% rename from java_constants/src/lib.rs rename to jvm-types/src/lib.rs diff --git a/jvm/Cargo.toml b/jvm/Cargo.toml index 55762af0..f0a51161 100644 --- a/jvm/Cargo.toml +++ b/jvm/Cargo.toml @@ -1,8 +1,10 @@ [package] name = "jvm" +description = "Core abstractions and runtime services for embeddable JVM implementations" version.workspace = true edition.workspace = true license.workspace = true +repository.workspace = true [dependencies] anyhow = { workspace = true } @@ -18,9 +20,9 @@ tracing = { workspace = true } event-listener = { version = "^5.4", default-features = false } -java_constants = { workspace = true } +jvm-types = { workspace = true } [dev-dependencies] tokio = { workspace = true, features = ["rt-multi-thread", "time"] } -test_utils = { workspace = true } +test-utils = { workspace = true } diff --git a/jvm/src/array_class_definition.rs b/jvm/src/array_class_definition.rs index 9b6f90d5..792b77b8 100644 --- a/jvm/src/array_class_definition.rs +++ b/jvm/src/array_class_definition.rs @@ -6,7 +6,7 @@ use alloc::{ vec::Vec, }; use dyn_clone::clone_trait_object; -use java_constants::ClassAccessFlags; +use jvm_types::ClassAccessFlags; use crate::{Jvm, Result, class_definition::ClassDefinition, class_instance::ClassInstance, field::Field, method::Method, value::JavaValue}; diff --git a/jvm/src/class_definition.rs b/jvm/src/class_definition.rs index 7612b5ec..b14e154a 100644 --- a/jvm/src/class_definition.rs +++ b/jvm/src/class_definition.rs @@ -3,7 +3,7 @@ use core::fmt::Debug; use dyn_clone::{DynClone, clone_trait_object}; -use java_constants::ClassAccessFlags; +use jvm_types::ClassAccessFlags; use crate::{ArrayClassDefinition, ClassInstance, Field, JavaValue, Jvm, Method, Result, as_any::AsAny}; diff --git a/jvm/src/field.rs b/jvm/src/field.rs index d20f8d8e..03b846c4 100644 --- a/jvm/src/field.rs +++ b/jvm/src/field.rs @@ -1,7 +1,7 @@ use alloc::string::String; use core::fmt::Debug; -use java_constants::FieldAccessFlags; +use jvm_types::FieldAccessFlags; use crate::as_any::AsAny; diff --git a/jvm/src/garbage_collector.rs b/jvm/src/garbage_collector.rs index 580c0130..be9786f2 100644 --- a/jvm/src/garbage_collector.rs +++ b/jvm/src/garbage_collector.rs @@ -1,5 +1,5 @@ use alloc::{boxed::Box, collections::BTreeMap, string::String, vec::Vec}; -use java_constants::FieldAccessFlags; +use jvm_types::FieldAccessFlags; use hashbrown::{HashSet, hash_set::Entry}; diff --git a/jvm/src/jvm.rs b/jvm/src/jvm.rs index d0aa9075..28ea9826 100644 --- a/jvm/src/jvm.rs +++ b/jvm/src/jvm.rs @@ -1,4 +1,5 @@ #![allow(clippy::borrowed_box)] // We have get parameter by Box to make ergonomic interface +#![allow(clippy::double_must_use)] // temporary until https://github.com/rust-lang/rust-clippy/issues/17529 fix lands use alloc::{borrow::ToOwned, boxed::Box, collections::BTreeMap, format, string::String, sync::Arc, vec::Vec}; use core::{ @@ -15,7 +16,7 @@ use event_listener::Event; use hashbrown::HashSet; use parking_lot::RwLock; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ Result, diff --git a/jvm/src/method.rs b/jvm/src/method.rs index 6dc7e752..92dc3237 100644 --- a/jvm/src/method.rs +++ b/jvm/src/method.rs @@ -1,7 +1,7 @@ use alloc::{boxed::Box, string::String}; use core::fmt::Debug; -use java_constants::MethodAccessFlags; +use jvm_types::MethodAccessFlags; use crate::{JavaValue, Jvm, Result, as_any::AsAny}; diff --git a/java_runtime/Cargo.toml b/rustjava-runtime/Cargo.toml similarity index 75% rename from java_runtime/Cargo.toml rename to rustjava-runtime/Cargo.toml index 201f96cc..d177cf0a 100644 --- a/java_runtime/Cargo.toml +++ b/rustjava-runtime/Cargo.toml @@ -1,8 +1,10 @@ [package] -name = "java_runtime" +name = "rustjava-runtime" +description = "A Java standard library implementation for RustJava" version.workspace = true edition.workspace = true license.workspace = true +repository.workspace = true [dependencies] async-trait = { workspace = true } @@ -19,12 +21,12 @@ encoding_rs = { version = "^0.8", features = ["alloc"], default-features = false url = { version = "^2.5", default-features = false } zip = { version = "^8.6", features = ["deflate"], default-features = false } -java_class_proto = { workspace = true } -java_constants = { workspace = true } jvm = { workspace = true } +jvm-class-proto = { workspace = true } +jvm-types = { workspace = true } [dev-dependencies] tokio = { workspace = true, features = ["rt-multi-thread", "time"] } -jvm_rust = { workspace = true } -test_utils = { workspace = true } +jvm-bytecode = { workspace = true } +test-utils = { workspace = true } diff --git a/java_runtime/src/charset.rs b/rustjava-runtime/src/charset.rs similarity index 100% rename from java_runtime/src/charset.rs rename to rustjava-runtime/src/charset.rs diff --git a/java_runtime/src/classes.rs b/rustjava-runtime/src/classes.rs similarity index 100% rename from java_runtime/src/classes.rs rename to rustjava-runtime/src/classes.rs diff --git a/java_runtime/src/classes/java.rs b/rustjava-runtime/src/classes/java.rs similarity index 100% rename from java_runtime/src/classes/java.rs rename to rustjava-runtime/src/classes/java.rs diff --git a/java_runtime/src/classes/java/io.rs b/rustjava-runtime/src/classes/java/io.rs similarity index 100% rename from java_runtime/src/classes/java/io.rs rename to rustjava-runtime/src/classes/java/io.rs diff --git a/java_runtime/src/classes/java/io/buffered_input_stream.rs b/rustjava-runtime/src/classes/java/io/buffered_input_stream.rs similarity index 99% rename from java_runtime/src/classes/java/io/buffered_input_stream.rs rename to rustjava-runtime/src/classes/java/io/buffered_input_stream.rs index f600afad..0473cddf 100644 --- a/java_runtime/src/classes/java/io/buffered_input_stream.rs +++ b/rustjava-runtime/src/classes/java/io/buffered_input_stream.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::io::InputStream}; diff --git a/java_runtime/src/classes/java/io/buffered_output_stream.rs b/rustjava-runtime/src/classes/java/io/buffered_output_stream.rs similarity index 98% rename from java_runtime/src/classes/java/io/buffered_output_stream.rs rename to rustjava-runtime/src/classes/java/io/buffered_output_stream.rs index 03526b95..59d0dd89 100644 --- a/java_runtime/src/classes/java/io/buffered_output_stream.rs +++ b/rustjava-runtime/src/classes/java/io/buffered_output_stream.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::io::OutputStream}; diff --git a/java_runtime/src/classes/java/io/buffered_reader.rs b/rustjava-runtime/src/classes/java/io/buffered_reader.rs similarity index 99% rename from java_runtime/src/classes/java/io/buffered_reader.rs rename to rustjava-runtime/src/classes/java/io/buffered_reader.rs index 757fe1ad..45b60374 100644 --- a/java_runtime/src/classes/java/io/buffered_reader.rs +++ b/rustjava-runtime/src/classes/java/io/buffered_reader.rs @@ -2,9 +2,9 @@ use core::{cmp::min, future::Future}; use alloc::{vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaChar, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/io/buffered_writer.rs b/rustjava-runtime/src/classes/java/io/buffered_writer.rs similarity index 99% rename from java_runtime/src/classes/java/io/buffered_writer.rs rename to rustjava-runtime/src/classes/java/io/buffered_writer.rs index 39ea303f..46c5f0e3 100644 --- a/java_runtime/src/classes/java/io/buffered_writer.rs +++ b/rustjava-runtime/src/classes/java/io/buffered_writer.rs @@ -2,9 +2,9 @@ use core::future::Future; use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaChar, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/io/byte_array_input_stream.rs b/rustjava-runtime/src/classes/java/io/byte_array_input_stream.rs similarity index 98% rename from java_runtime/src/classes/java/io/byte_array_input_stream.rs rename to rustjava-runtime/src/classes/java/io/byte_array_input_stream.rs index eafe9094..b06ee4f4 100644 --- a/java_runtime/src/classes/java/io/byte_array_input_stream.rs +++ b/rustjava-runtime/src/classes/java/io/byte_array_input_stream.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext}; diff --git a/java_runtime/src/classes/java/io/byte_array_output_stream.rs b/rustjava-runtime/src/classes/java/io/byte_array_output_stream.rs similarity index 98% rename from java_runtime/src/classes/java/io/byte_array_output_stream.rs rename to rustjava-runtime/src/classes/java/io/byte_array_output_stream.rs index 9a8c690d..6bd99c3a 100644 --- a/java_runtime/src/classes/java/io/byte_array_output_stream.rs +++ b/rustjava-runtime/src/classes/java/io/byte_array_output_stream.rs @@ -1,8 +1,8 @@ use alloc::{vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/io/char_array_reader.rs b/rustjava-runtime/src/classes/java/io/char_array_reader.rs similarity index 98% rename from java_runtime/src/classes/java/io/char_array_reader.rs rename to rustjava-runtime/src/classes/java/io/char_array_reader.rs index fe9d83f2..123b7242 100644 --- a/java_runtime/src/classes/java/io/char_array_reader.rs +++ b/rustjava-runtime/src/classes/java/io/char_array_reader.rs @@ -2,9 +2,9 @@ use core::future::Future; use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaChar, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/io/char_array_writer.rs b/rustjava-runtime/src/classes/java/io/char_array_writer.rs similarity index 98% rename from java_runtime/src/classes/java/io/char_array_writer.rs rename to rustjava-runtime/src/classes/java/io/char_array_writer.rs index f591394e..929ac455 100644 --- a/java_runtime/src/classes/java/io/char_array_writer.rs +++ b/rustjava-runtime/src/classes/java/io/char_array_writer.rs @@ -2,9 +2,9 @@ use core::future::Future; use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaChar, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/io/closeable.rs b/rustjava-runtime/src/classes/java/io/closeable.rs similarity index 86% rename from java_runtime/src/classes/java/io/closeable.rs rename to rustjava-runtime/src/classes/java/io/closeable.rs index 169ebdb1..558d5e23 100644 --- a/java_runtime/src/classes/java/io/closeable.rs +++ b/rustjava-runtime/src/classes/java/io/closeable.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/io/data_input.rs b/rustjava-runtime/src/classes/java/io/data_input.rs similarity index 95% rename from java_runtime/src/classes/java/io/data_input.rs rename to rustjava-runtime/src/classes/java/io/data_input.rs index e4322bf6..597018c2 100644 --- a/java_runtime/src/classes/java/io/data_input.rs +++ b/rustjava-runtime/src/classes/java/io/data_input.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; // interface java.io.DataInput diff --git a/java_runtime/src/classes/java/io/data_input_stream.rs b/rustjava-runtime/src/classes/java/io/data_input_stream.rs similarity index 99% rename from java_runtime/src/classes/java/io/data_input_stream.rs rename to rustjava-runtime/src/classes/java/io/data_input_stream.rs index 30f10d6c..6c7186d0 100644 --- a/java_runtime/src/classes/java/io/data_input_stream.rs +++ b/rustjava-runtime/src/classes/java/io/data_input_stream.rs @@ -1,8 +1,8 @@ use alloc::{vec, vec::Vec}; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaChar, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/io/data_output.rs b/rustjava-runtime/src/classes/java/io/data_output.rs similarity index 96% rename from java_runtime/src/classes/java/io/data_output.rs rename to rustjava-runtime/src/classes/java/io/data_output.rs index 89b3cd5a..255221e8 100644 --- a/java_runtime/src/classes/java/io/data_output.rs +++ b/rustjava-runtime/src/classes/java/io/data_output.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/io/data_output_stream.rs b/rustjava-runtime/src/classes/java/io/data_output_stream.rs similarity index 99% rename from java_runtime/src/classes/java/io/data_output_stream.rs rename to rustjava-runtime/src/classes/java/io/data_output_stream.rs index 4680878b..9c4a2bfd 100644 --- a/java_runtime/src/classes/java/io/data_output_stream.rs +++ b/rustjava-runtime/src/classes/java/io/data_output_stream.rs @@ -2,9 +2,9 @@ use alloc::{vec, vec::Vec}; use bytemuck::cast_vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaChar, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/io/eof_exception.rs b/rustjava-runtime/src/classes/java/io/eof_exception.rs similarity index 93% rename from java_runtime/src/classes/java/io/eof_exception.rs rename to rustjava-runtime/src/classes/java/io/eof_exception.rs index 525b4d4f..313ca9a6 100644 --- a/java_runtime/src/classes/java/io/eof_exception.rs +++ b/rustjava-runtime/src/classes/java/io/eof_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/io/file.rs b/rustjava-runtime/src/classes/java/io/file.rs similarity index 97% rename from java_runtime/src/classes/java/io/file.rs rename to rustjava-runtime/src/classes/java/io/file.rs index 99297324..c22c9194 100644 --- a/java_runtime/src/classes/java/io/file.rs +++ b/rustjava-runtime/src/classes/java/io/file.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, JavaChar, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{FileType, RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/io/file_descriptor.rs b/rustjava-runtime/src/classes/java/io/file_descriptor.rs similarity index 96% rename from java_runtime/src/classes/java/io/file_descriptor.rs rename to rustjava-runtime/src/classes/java/io/file_descriptor.rs index 5b084eb5..537231cc 100644 --- a/java_runtime/src/classes/java/io/file_descriptor.rs +++ b/rustjava-runtime/src/classes/java/io/file_descriptor.rs @@ -1,8 +1,8 @@ use alloc::{boxed::Box, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext}; diff --git a/java_runtime/src/classes/java/io/file_input_stream.rs b/rustjava-runtime/src/classes/java/io/file_input_stream.rs similarity index 97% rename from java_runtime/src/classes/java/io/file_input_stream.rs rename to rustjava-runtime/src/classes/java/io/file_input_stream.rs index c229772d..9ed873df 100644 --- a/java_runtime/src/classes/java/io/file_input_stream.rs +++ b/rustjava-runtime/src/classes/java/io/file_input_stream.rs @@ -2,9 +2,9 @@ use alloc::vec; use bytemuck::cast_vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ FileOpenOptions, RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/io/file_not_found_exception.rs b/rustjava-runtime/src/classes/java/io/file_not_found_exception.rs similarity index 93% rename from java_runtime/src/classes/java/io/file_not_found_exception.rs rename to rustjava-runtime/src/classes/java/io/file_not_found_exception.rs index 4ca66331..6b7ba854 100644 --- a/java_runtime/src/classes/java/io/file_not_found_exception.rs +++ b/rustjava-runtime/src/classes/java/io/file_not_found_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/io/file_output_stream.rs b/rustjava-runtime/src/classes/java/io/file_output_stream.rs similarity index 97% rename from java_runtime/src/classes/java/io/file_output_stream.rs rename to rustjava-runtime/src/classes/java/io/file_output_stream.rs index 3e53e79a..e72d02c0 100644 --- a/java_runtime/src/classes/java/io/file_output_stream.rs +++ b/rustjava-runtime/src/classes/java/io/file_output_stream.rs @@ -2,9 +2,9 @@ use alloc::vec; use bytemuck::cast_slice; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ FileOpenOptions, RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/io/file_reader.rs b/rustjava-runtime/src/classes/java/io/file_reader.rs similarity index 96% rename from java_runtime/src/classes/java/io/file_reader.rs rename to rustjava-runtime/src/classes/java/io/file_reader.rs index 7b7eb504..cf2909fa 100644 --- a/java_runtime/src/classes/java/io/file_reader.rs +++ b/rustjava-runtime/src/classes/java/io/file_reader.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/io/file_writer.rs b/rustjava-runtime/src/classes/java/io/file_writer.rs similarity index 97% rename from java_runtime/src/classes/java/io/file_writer.rs rename to rustjava-runtime/src/classes/java/io/file_writer.rs index 4e77e4a2..9a6e0402 100644 --- a/java_runtime/src/classes/java/io/file_writer.rs +++ b/rustjava-runtime/src/classes/java/io/file_writer.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/io/filter_input_stream.rs b/rustjava-runtime/src/classes/java/io/filter_input_stream.rs similarity index 97% rename from java_runtime/src/classes/java/io/filter_input_stream.rs rename to rustjava-runtime/src/classes/java/io/filter_input_stream.rs index 7a271523..f9412ed1 100644 --- a/java_runtime/src/classes/java/io/filter_input_stream.rs +++ b/rustjava-runtime/src/classes/java/io/filter_input_stream.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::io::InputStream}; diff --git a/java_runtime/src/classes/java/io/filter_output_stream.rs b/rustjava-runtime/src/classes/java/io/filter_output_stream.rs similarity index 96% rename from java_runtime/src/classes/java/io/filter_output_stream.rs rename to rustjava-runtime/src/classes/java/io/filter_output_stream.rs index e8aaf95d..0329555b 100644 --- a/java_runtime/src/classes/java/io/filter_output_stream.rs +++ b/rustjava-runtime/src/classes/java/io/filter_output_stream.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaError, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::io::OutputStream}; diff --git a/java_runtime/src/classes/java/io/flushable.rs b/rustjava-runtime/src/classes/java/io/flushable.rs similarity index 86% rename from java_runtime/src/classes/java/io/flushable.rs rename to rustjava-runtime/src/classes/java/io/flushable.rs index 145df7db..b1b3fddb 100644 --- a/java_runtime/src/classes/java/io/flushable.rs +++ b/rustjava-runtime/src/classes/java/io/flushable.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/io/input_stream.rs b/rustjava-runtime/src/classes/java/io/input_stream.rs similarity index 98% rename from java_runtime/src/classes/java/io/input_stream.rs rename to rustjava-runtime/src/classes/java/io/input_stream.rs index ec9bffd2..23a6a811 100644 --- a/java_runtime/src/classes/java/io/input_stream.rs +++ b/rustjava-runtime/src/classes/java/io/input_stream.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext}; diff --git a/java_runtime/src/classes/java/io/input_stream_reader.rs b/rustjava-runtime/src/classes/java/io/input_stream_reader.rs similarity index 98% rename from java_runtime/src/classes/java/io/input_stream_reader.rs rename to rustjava-runtime/src/classes/java/io/input_stream_reader.rs index 07e3f78b..8c8b93e9 100644 --- a/java_runtime/src/classes/java/io/input_stream_reader.rs +++ b/rustjava-runtime/src/classes/java/io/input_stream_reader.rs @@ -4,9 +4,9 @@ use alloc::{vec, vec::Vec}; use bytemuck::{cast_slice, cast_vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaChar, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/io/interrupted_io_exception.rs b/rustjava-runtime/src/classes/java/io/interrupted_io_exception.rs similarity index 92% rename from java_runtime/src/classes/java/io/interrupted_io_exception.rs rename to rustjava-runtime/src/classes/java/io/interrupted_io_exception.rs index aa40f50b..7f05847c 100644 --- a/java_runtime/src/classes/java/io/interrupted_io_exception.rs +++ b/rustjava-runtime/src/classes/java/io/interrupted_io_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/io/io_exception.rs b/rustjava-runtime/src/classes/java/io/io_exception.rs similarity index 93% rename from java_runtime/src/classes/java/io/io_exception.rs rename to rustjava-runtime/src/classes/java/io/io_exception.rs index f9cab76f..cd847c33 100644 --- a/java_runtime/src/classes/java/io/io_exception.rs +++ b/rustjava-runtime/src/classes/java/io/io_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/io/output_stream.rs b/rustjava-runtime/src/classes/java/io/output_stream.rs similarity index 97% rename from java_runtime/src/classes/java/io/output_stream.rs rename to rustjava-runtime/src/classes/java/io/output_stream.rs index 3cb53fbe..6bf01ef1 100644 --- a/java_runtime/src/classes/java/io/output_stream.rs +++ b/rustjava-runtime/src/classes/java/io/output_stream.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext}; diff --git a/java_runtime/src/classes/java/io/output_stream_writer.rs b/rustjava-runtime/src/classes/java/io/output_stream_writer.rs similarity index 98% rename from java_runtime/src/classes/java/io/output_stream_writer.rs rename to rustjava-runtime/src/classes/java/io/output_stream_writer.rs index b56905a1..d6e2434d 100644 --- a/java_runtime/src/classes/java/io/output_stream_writer.rs +++ b/rustjava-runtime/src/classes/java/io/output_stream_writer.rs @@ -1,8 +1,8 @@ use alloc::{string::String as RustString, vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaChar, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/io/print_stream.rs b/rustjava-runtime/src/classes/java/io/print_stream.rs similarity index 99% rename from java_runtime/src/classes/java/io/print_stream.rs rename to rustjava-runtime/src/classes/java/io/print_stream.rs index 86dbdadb..3d08d204 100644 --- a/java_runtime/src/classes/java/io/print_stream.rs +++ b/rustjava-runtime/src/classes/java/io/print_stream.rs @@ -2,9 +2,9 @@ use core::future::Future; use alloc::{vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/io/print_writer.rs b/rustjava-runtime/src/classes/java/io/print_writer.rs similarity index 99% rename from java_runtime/src/classes/java/io/print_writer.rs rename to rustjava-runtime/src/classes/java/io/print_writer.rs index d264b706..5a2f8408 100644 --- a/java_runtime/src/classes/java/io/print_writer.rs +++ b/rustjava-runtime/src/classes/java/io/print_writer.rs @@ -2,9 +2,9 @@ use core::future::Future; use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/io/random_access_file.rs b/rustjava-runtime/src/classes/java/io/random_access_file.rs similarity index 98% rename from java_runtime/src/classes/java/io/random_access_file.rs rename to rustjava-runtime/src/classes/java/io/random_access_file.rs index e1f02019..59ab137e 100644 --- a/java_runtime/src/classes/java/io/random_access_file.rs +++ b/rustjava-runtime/src/classes/java/io/random_access_file.rs @@ -2,9 +2,9 @@ use alloc::vec; use bytemuck::cast_vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ FileOpenOptions, RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/io/reader.rs b/rustjava-runtime/src/classes/java/io/reader.rs similarity index 97% rename from java_runtime/src/classes/java/io/reader.rs rename to rustjava-runtime/src/classes/java/io/reader.rs index 39f13a50..4aff769c 100644 --- a/java_runtime/src/classes/java/io/reader.rs +++ b/rustjava-runtime/src/classes/java/io/reader.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaChar, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/io/serializable.rs b/rustjava-runtime/src/classes/java/io/serializable.rs similarity index 92% rename from java_runtime/src/classes/java/io/serializable.rs rename to rustjava-runtime/src/classes/java/io/serializable.rs index d2452dd3..5ab54175 100644 --- a/java_runtime/src/classes/java/io/serializable.rs +++ b/rustjava-runtime/src/classes/java/io/serializable.rs @@ -1,6 +1,6 @@ use alloc::vec; -use java_constants::ClassAccessFlags; +use jvm_types::ClassAccessFlags; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/io/string_reader.rs b/rustjava-runtime/src/classes/java/io/string_reader.rs similarity index 98% rename from java_runtime/src/classes/java/io/string_reader.rs rename to rustjava-runtime/src/classes/java/io/string_reader.rs index 4b200824..bd7e0fc1 100644 --- a/java_runtime/src/classes/java/io/string_reader.rs +++ b/rustjava-runtime/src/classes/java/io/string_reader.rs @@ -2,9 +2,9 @@ use core::future::Future; use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaChar, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/io/string_writer.rs b/rustjava-runtime/src/classes/java/io/string_writer.rs similarity index 96% rename from java_runtime/src/classes/java/io/string_writer.rs rename to rustjava-runtime/src/classes/java/io/string_writer.rs index a57b54ce..71c7b107 100644 --- a/java_runtime/src/classes/java/io/string_writer.rs +++ b/rustjava-runtime/src/classes/java/io/string_writer.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaChar, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/io/unsupported_encoding_exception.rs b/rustjava-runtime/src/classes/java/io/unsupported_encoding_exception.rs similarity index 93% rename from java_runtime/src/classes/java/io/unsupported_encoding_exception.rs rename to rustjava-runtime/src/classes/java/io/unsupported_encoding_exception.rs index 0b5ed007..ea8aae65 100644 --- a/java_runtime/src/classes/java/io/unsupported_encoding_exception.rs +++ b/rustjava-runtime/src/classes/java/io/unsupported_encoding_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/io/utf_data_format_exception.rs b/rustjava-runtime/src/classes/java/io/utf_data_format_exception.rs similarity index 93% rename from java_runtime/src/classes/java/io/utf_data_format_exception.rs rename to rustjava-runtime/src/classes/java/io/utf_data_format_exception.rs index e1579f96..7d8a48d6 100644 --- a/java_runtime/src/classes/java/io/utf_data_format_exception.rs +++ b/rustjava-runtime/src/classes/java/io/utf_data_format_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/io/writer.rs b/rustjava-runtime/src/classes/java/io/writer.rs similarity index 98% rename from java_runtime/src/classes/java/io/writer.rs rename to rustjava-runtime/src/classes/java/io/writer.rs index bb90f0b4..8590ff63 100644 --- a/java_runtime/src/classes/java/io/writer.rs +++ b/rustjava-runtime/src/classes/java/io/writer.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaChar, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang.rs b/rustjava-runtime/src/classes/java/lang.rs similarity index 100% rename from java_runtime/src/classes/java/lang.rs rename to rustjava-runtime/src/classes/java/lang.rs diff --git a/java_runtime/src/classes/java/lang/abstract_method_error.rs b/rustjava-runtime/src/classes/java/lang/abstract_method_error.rs similarity index 94% rename from java_runtime/src/classes/java/lang/abstract_method_error.rs rename to rustjava-runtime/src/classes/java/lang/abstract_method_error.rs index 0a18a441..ada8ae47 100644 --- a/java_runtime/src/classes/java/lang/abstract_method_error.rs +++ b/rustjava-runtime/src/classes/java/lang/abstract_method_error.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/abstract_string_builder.rs b/rustjava-runtime/src/classes/java/lang/abstract_string_builder.rs similarity index 99% rename from java_runtime/src/classes/java/lang/abstract_string_builder.rs rename to rustjava-runtime/src/classes/java/lang/abstract_string_builder.rs index e02f15d4..3c239eeb 100644 --- a/java_runtime/src/classes/java/lang/abstract_string_builder.rs +++ b/rustjava-runtime/src/classes/java/lang/abstract_string_builder.rs @@ -1,8 +1,8 @@ use alloc::{format, string::ToString, vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaChar, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang/appendable.rs b/rustjava-runtime/src/classes/java/lang/appendable.rs similarity index 92% rename from java_runtime/src/classes/java/lang/appendable.rs rename to rustjava-runtime/src/classes/java/lang/appendable.rs index 4bcf7158..34967634 100644 --- a/java_runtime/src/classes/java/lang/appendable.rs +++ b/rustjava-runtime/src/classes/java/lang/appendable.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/lang/arithmetic_exception.rs b/rustjava-runtime/src/classes/java/lang/arithmetic_exception.rs similarity index 93% rename from java_runtime/src/classes/java/lang/arithmetic_exception.rs rename to rustjava-runtime/src/classes/java/lang/arithmetic_exception.rs index cee62369..7a60fb1b 100644 --- a/java_runtime/src/classes/java/lang/arithmetic_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/arithmetic_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/array_index_out_of_bounds_exception.rs b/rustjava-runtime/src/classes/java/lang/array_index_out_of_bounds_exception.rs similarity index 94% rename from java_runtime/src/classes/java/lang/array_index_out_of_bounds_exception.rs rename to rustjava-runtime/src/classes/java/lang/array_index_out_of_bounds_exception.rs index abc86c46..ca878b43 100644 --- a/java_runtime/src/classes/java/lang/array_index_out_of_bounds_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/array_index_out_of_bounds_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/array_store_exception.rs b/rustjava-runtime/src/classes/java/lang/array_store_exception.rs similarity index 93% rename from java_runtime/src/classes/java/lang/array_store_exception.rs rename to rustjava-runtime/src/classes/java/lang/array_store_exception.rs index 50291624..2125995d 100644 --- a/java_runtime/src/classes/java/lang/array_store_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/array_store_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/boolean.rs b/rustjava-runtime/src/classes/java/lang/boolean.rs similarity index 98% rename from java_runtime/src/classes/java/lang/boolean.rs rename to rustjava-runtime/src/classes/java/lang/boolean.rs index cab12dc3..9313ae70 100644 --- a/java_runtime/src/classes/java/lang/boolean.rs +++ b/rustjava-runtime/src/classes/java/lang/boolean.rs @@ -1,11 +1,11 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ ClassInstanceRef, Jvm, Result, runtime::{JavaLangClass, JavaLangString}, }; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang/byte.rs b/rustjava-runtime/src/classes/java/lang/byte.rs similarity index 98% rename from java_runtime/src/classes/java/lang/byte.rs rename to rustjava-runtime/src/classes/java/lang/byte.rs index 34db001c..01996f99 100644 --- a/java_runtime/src/classes/java/lang/byte.rs +++ b/rustjava-runtime/src/classes/java/lang/byte.rs @@ -1,11 +1,11 @@ use alloc::{format, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ ClassInstanceRef, Jvm, Result, runtime::{JavaLangClass, JavaLangString}, }; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang/char_sequence.rs b/rustjava-runtime/src/classes/java/lang/char_sequence.rs similarity index 92% rename from java_runtime/src/classes/java/lang/char_sequence.rs rename to rustjava-runtime/src/classes/java/lang/char_sequence.rs index 5cb485bd..9fdd9dd7 100644 --- a/java_runtime/src/classes/java/lang/char_sequence.rs +++ b/rustjava-runtime/src/classes/java/lang/char_sequence.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/lang/character.rs b/rustjava-runtime/src/classes/java/lang/character.rs similarity index 99% rename from java_runtime/src/classes/java/lang/character.rs rename to rustjava-runtime/src/classes/java/lang/character.rs index 6b6e7113..889ffbf9 100644 --- a/java_runtime/src/classes/java/lang/character.rs +++ b/rustjava-runtime/src/classes/java/lang/character.rs @@ -2,9 +2,9 @@ use core::char; use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, JavaChar, Jvm, Result, runtime::JavaLangClass}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang/class.rs b/rustjava-runtime/src/classes/java/lang/class.rs similarity index 99% rename from java_runtime/src/classes/java/lang/class.rs rename to rustjava-runtime/src/classes/java/lang/class.rs index 31f149e6..6dfce985 100644 --- a/java_runtime/src/classes/java/lang/class.rs +++ b/rustjava-runtime/src/classes/java/lang/class.rs @@ -1,11 +1,11 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ ClassInstanceRef, JavaType, Jvm, Result, runtime::{JavaLangClass, JavaLangClassLoader, JavaLangString}, }; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang/class_cast_exception.rs b/rustjava-runtime/src/classes/java/lang/class_cast_exception.rs similarity index 93% rename from java_runtime/src/classes/java/lang/class_cast_exception.rs rename to rustjava-runtime/src/classes/java/lang/class_cast_exception.rs index d64b3e2f..0eb56708 100644 --- a/java_runtime/src/classes/java/lang/class_cast_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/class_cast_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/class_circularity_error.rs b/rustjava-runtime/src/classes/java/lang/class_circularity_error.rs similarity index 93% rename from java_runtime/src/classes/java/lang/class_circularity_error.rs rename to rustjava-runtime/src/classes/java/lang/class_circularity_error.rs index eb04f0f4..8c5da8d1 100644 --- a/java_runtime/src/classes/java/lang/class_circularity_error.rs +++ b/rustjava-runtime/src/classes/java/lang/class_circularity_error.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/class_format_error.rs b/rustjava-runtime/src/classes/java/lang/class_format_error.rs similarity index 93% rename from java_runtime/src/classes/java/lang/class_format_error.rs rename to rustjava-runtime/src/classes/java/lang/class_format_error.rs index afc805de..4ba9e679 100644 --- a/java_runtime/src/classes/java/lang/class_format_error.rs +++ b/rustjava-runtime/src/classes/java/lang/class_format_error.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/class_loader.rs b/rustjava-runtime/src/classes/java/lang/class_loader.rs similarity index 99% rename from java_runtime/src/classes/java/lang/class_loader.rs rename to rustjava-runtime/src/classes/java/lang/class_loader.rs index 616b4d44..e2e3c095 100644 --- a/java_runtime/src/classes/java/lang/class_loader.rs +++ b/rustjava-runtime/src/classes/java/lang/class_loader.rs @@ -1,8 +1,8 @@ use alloc::{format, vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang/class_not_found_exception.rs b/rustjava-runtime/src/classes/java/lang/class_not_found_exception.rs similarity index 93% rename from java_runtime/src/classes/java/lang/class_not_found_exception.rs rename to rustjava-runtime/src/classes/java/lang/class_not_found_exception.rs index 9dbae2e9..ba90ecb2 100644 --- a/java_runtime/src/classes/java/lang/class_not_found_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/class_not_found_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/clone_not_supported_exception.rs b/rustjava-runtime/src/classes/java/lang/clone_not_supported_exception.rs similarity index 94% rename from java_runtime/src/classes/java/lang/clone_not_supported_exception.rs rename to rustjava-runtime/src/classes/java/lang/clone_not_supported_exception.rs index de255202..fb3ef6d9 100644 --- a/java_runtime/src/classes/java/lang/clone_not_supported_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/clone_not_supported_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/cloneable.rs b/rustjava-runtime/src/classes/java/lang/cloneable.rs similarity index 91% rename from java_runtime/src/classes/java/lang/cloneable.rs rename to rustjava-runtime/src/classes/java/lang/cloneable.rs index aa86717d..a10370f0 100644 --- a/java_runtime/src/classes/java/lang/cloneable.rs +++ b/rustjava-runtime/src/classes/java/lang/cloneable.rs @@ -1,6 +1,6 @@ use alloc::vec; -use java_constants::ClassAccessFlags; +use jvm_types::ClassAccessFlags; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/lang/comparable.rs b/rustjava-runtime/src/classes/java/lang/comparable.rs similarity index 87% rename from java_runtime/src/classes/java/lang/comparable.rs rename to rustjava-runtime/src/classes/java/lang/comparable.rs index 68361ee9..2843768f 100644 --- a/java_runtime/src/classes/java/lang/comparable.rs +++ b/rustjava-runtime/src/classes/java/lang/comparable.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/lang/double.rs b/rustjava-runtime/src/classes/java/lang/double.rs similarity index 99% rename from java_runtime/src/classes/java/lang/double.rs rename to rustjava-runtime/src/classes/java/lang/double.rs index 106051f3..8f8e8a92 100644 --- a/java_runtime/src/classes/java/lang/double.rs +++ b/rustjava-runtime/src/classes/java/lang/double.rs @@ -1,11 +1,11 @@ use alloc::{format, string::String as RustString, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ ClassInstanceRef, Jvm, Result, runtime::{JavaLangClass, JavaLangString}, }; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang/enum.rs b/rustjava-runtime/src/classes/java/lang/enum.rs similarity index 98% rename from java_runtime/src/classes/java/lang/enum.rs rename to rustjava-runtime/src/classes/java/lang/enum.rs index 36963e2d..8381f53d 100644 --- a/java_runtime/src/classes/java/lang/enum.rs +++ b/rustjava-runtime/src/classes/java/lang/enum.rs @@ -1,8 +1,8 @@ use alloc::{format, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangClass}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang/error.rs b/rustjava-runtime/src/classes/java/lang/error.rs similarity index 93% rename from java_runtime/src/classes/java/lang/error.rs rename to rustjava-runtime/src/classes/java/lang/error.rs index 4a44f10d..524dad58 100644 --- a/java_runtime/src/classes/java/lang/error.rs +++ b/rustjava-runtime/src/classes/java/lang/error.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/exception.rs b/rustjava-runtime/src/classes/java/lang/exception.rs similarity index 96% rename from java_runtime/src/classes/java/lang/exception.rs rename to rustjava-runtime/src/classes/java/lang/exception.rs index 1e4096a8..e20edfc5 100644 --- a/java_runtime/src/classes/java/lang/exception.rs +++ b/rustjava-runtime/src/classes/java/lang/exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang/exception_in_initializer_error.rs b/rustjava-runtime/src/classes/java/lang/exception_in_initializer_error.rs similarity index 96% rename from java_runtime/src/classes/java/lang/exception_in_initializer_error.rs rename to rustjava-runtime/src/classes/java/lang/exception_in_initializer_error.rs index df76daf5..f6447502 100644 --- a/java_runtime/src/classes/java/lang/exception_in_initializer_error.rs +++ b/rustjava-runtime/src/classes/java/lang/exception_in_initializer_error.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang/float.rs b/rustjava-runtime/src/classes/java/lang/float.rs similarity index 99% rename from java_runtime/src/classes/java/lang/float.rs rename to rustjava-runtime/src/classes/java/lang/float.rs index abe7b54c..fd509c6e 100644 --- a/java_runtime/src/classes/java/lang/float.rs +++ b/rustjava-runtime/src/classes/java/lang/float.rs @@ -1,11 +1,11 @@ use alloc::{format, string::String as RustString, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ ClassInstanceRef, Jvm, Result, runtime::{JavaLangClass, JavaLangString}, }; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang/illegal_access_error.rs b/rustjava-runtime/src/classes/java/lang/illegal_access_error.rs similarity index 94% rename from java_runtime/src/classes/java/lang/illegal_access_error.rs rename to rustjava-runtime/src/classes/java/lang/illegal_access_error.rs index c3a68d97..8874453b 100644 --- a/java_runtime/src/classes/java/lang/illegal_access_error.rs +++ b/rustjava-runtime/src/classes/java/lang/illegal_access_error.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/illegal_access_exception.rs b/rustjava-runtime/src/classes/java/lang/illegal_access_exception.rs similarity index 93% rename from java_runtime/src/classes/java/lang/illegal_access_exception.rs rename to rustjava-runtime/src/classes/java/lang/illegal_access_exception.rs index 723b0d68..ff7a07cc 100644 --- a/java_runtime/src/classes/java/lang/illegal_access_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/illegal_access_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/illegal_argument_exception.rs b/rustjava-runtime/src/classes/java/lang/illegal_argument_exception.rs similarity index 94% rename from java_runtime/src/classes/java/lang/illegal_argument_exception.rs rename to rustjava-runtime/src/classes/java/lang/illegal_argument_exception.rs index 3f6ba283..156e9727 100644 --- a/java_runtime/src/classes/java/lang/illegal_argument_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/illegal_argument_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/illegal_monitor_state_exception.rs b/rustjava-runtime/src/classes/java/lang/illegal_monitor_state_exception.rs similarity index 93% rename from java_runtime/src/classes/java/lang/illegal_monitor_state_exception.rs rename to rustjava-runtime/src/classes/java/lang/illegal_monitor_state_exception.rs index 3e57a56b..2e44b42b 100644 --- a/java_runtime/src/classes/java/lang/illegal_monitor_state_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/illegal_monitor_state_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/illegal_state_exception.rs b/rustjava-runtime/src/classes/java/lang/illegal_state_exception.rs similarity index 93% rename from java_runtime/src/classes/java/lang/illegal_state_exception.rs rename to rustjava-runtime/src/classes/java/lang/illegal_state_exception.rs index c82a261a..038bf468 100644 --- a/java_runtime/src/classes/java/lang/illegal_state_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/illegal_state_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/illegal_thread_state_exception.rs b/rustjava-runtime/src/classes/java/lang/illegal_thread_state_exception.rs similarity index 93% rename from java_runtime/src/classes/java/lang/illegal_thread_state_exception.rs rename to rustjava-runtime/src/classes/java/lang/illegal_thread_state_exception.rs index b18815b6..e6641e91 100644 --- a/java_runtime/src/classes/java/lang/illegal_thread_state_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/illegal_thread_state_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/incompatible_class_change_error.rs b/rustjava-runtime/src/classes/java/lang/incompatible_class_change_error.rs similarity index 94% rename from java_runtime/src/classes/java/lang/incompatible_class_change_error.rs rename to rustjava-runtime/src/classes/java/lang/incompatible_class_change_error.rs index 10408df0..61d50e91 100644 --- a/java_runtime/src/classes/java/lang/incompatible_class_change_error.rs +++ b/rustjava-runtime/src/classes/java/lang/incompatible_class_change_error.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/index_out_of_bounds_exception.rs b/rustjava-runtime/src/classes/java/lang/index_out_of_bounds_exception.rs similarity index 94% rename from java_runtime/src/classes/java/lang/index_out_of_bounds_exception.rs rename to rustjava-runtime/src/classes/java/lang/index_out_of_bounds_exception.rs index 58033f93..d6de7d3d 100644 --- a/java_runtime/src/classes/java/lang/index_out_of_bounds_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/index_out_of_bounds_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/instantiation_error.rs b/rustjava-runtime/src/classes/java/lang/instantiation_error.rs similarity index 94% rename from java_runtime/src/classes/java/lang/instantiation_error.rs rename to rustjava-runtime/src/classes/java/lang/instantiation_error.rs index 5309ea87..72f89f15 100644 --- a/java_runtime/src/classes/java/lang/instantiation_error.rs +++ b/rustjava-runtime/src/classes/java/lang/instantiation_error.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/instantiation_exception.rs b/rustjava-runtime/src/classes/java/lang/instantiation_exception.rs similarity index 93% rename from java_runtime/src/classes/java/lang/instantiation_exception.rs rename to rustjava-runtime/src/classes/java/lang/instantiation_exception.rs index be5475cc..107edb33 100644 --- a/java_runtime/src/classes/java/lang/instantiation_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/instantiation_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/integer.rs b/rustjava-runtime/src/classes/java/lang/integer.rs similarity index 99% rename from java_runtime/src/classes/java/lang/integer.rs rename to rustjava-runtime/src/classes/java/lang/integer.rs index 04c490e4..eda4b485 100644 --- a/java_runtime/src/classes/java/lang/integer.rs +++ b/rustjava-runtime/src/classes/java/lang/integer.rs @@ -1,11 +1,11 @@ use alloc::{format, string::String as RustString, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ ClassInstanceRef, JavaChar, JavaError, Jvm, Result, runtime::{JavaLangClass, JavaLangString}, }; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang/internal_error.rs b/rustjava-runtime/src/classes/java/lang/internal_error.rs similarity index 93% rename from java_runtime/src/classes/java/lang/internal_error.rs rename to rustjava-runtime/src/classes/java/lang/internal_error.rs index 92bbc08c..31ea1d83 100644 --- a/java_runtime/src/classes/java/lang/internal_error.rs +++ b/rustjava-runtime/src/classes/java/lang/internal_error.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/interrupted_exception.rs b/rustjava-runtime/src/classes/java/lang/interrupted_exception.rs similarity index 93% rename from java_runtime/src/classes/java/lang/interrupted_exception.rs rename to rustjava-runtime/src/classes/java/lang/interrupted_exception.rs index 727150e7..43f79dd4 100644 --- a/java_runtime/src/classes/java/lang/interrupted_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/interrupted_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/linkage_error.rs b/rustjava-runtime/src/classes/java/lang/linkage_error.rs similarity index 93% rename from java_runtime/src/classes/java/lang/linkage_error.rs rename to rustjava-runtime/src/classes/java/lang/linkage_error.rs index 3ff045df..dcddb441 100644 --- a/java_runtime/src/classes/java/lang/linkage_error.rs +++ b/rustjava-runtime/src/classes/java/lang/linkage_error.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/long.rs b/rustjava-runtime/src/classes/java/lang/long.rs similarity index 99% rename from java_runtime/src/classes/java/lang/long.rs rename to rustjava-runtime/src/classes/java/lang/long.rs index 669eadd1..7d938501 100644 --- a/java_runtime/src/classes/java/lang/long.rs +++ b/rustjava-runtime/src/classes/java/lang/long.rs @@ -1,11 +1,11 @@ use alloc::{format, string::String as RustString, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ ClassInstanceRef, JavaChar, JavaError, Jvm, Result, runtime::{JavaLangClass, JavaLangString}, }; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang/math.rs b/rustjava-runtime/src/classes/java/lang/math.rs similarity index 99% rename from java_runtime/src/classes/java/lang/math.rs rename to rustjava-runtime/src/classes/java/lang/math.rs index 21831c2e..9eb91609 100644 --- a/java_runtime/src/classes/java/lang/math.rs +++ b/rustjava-runtime/src/classes/java/lang/math.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::util::Random}; diff --git a/java_runtime/src/classes/java/lang/negative_array_size_exception.rs b/rustjava-runtime/src/classes/java/lang/negative_array_size_exception.rs similarity index 93% rename from java_runtime/src/classes/java/lang/negative_array_size_exception.rs rename to rustjava-runtime/src/classes/java/lang/negative_array_size_exception.rs index e0a03781..8f7b3db6 100644 --- a/java_runtime/src/classes/java/lang/negative_array_size_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/negative_array_size_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/no_class_def_found_error.rs b/rustjava-runtime/src/classes/java/lang/no_class_def_found_error.rs similarity index 93% rename from java_runtime/src/classes/java/lang/no_class_def_found_error.rs rename to rustjava-runtime/src/classes/java/lang/no_class_def_found_error.rs index 6268c486..b6ba2b6e 100644 --- a/java_runtime/src/classes/java/lang/no_class_def_found_error.rs +++ b/rustjava-runtime/src/classes/java/lang/no_class_def_found_error.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/no_such_field_error.rs b/rustjava-runtime/src/classes/java/lang/no_such_field_error.rs similarity index 94% rename from java_runtime/src/classes/java/lang/no_such_field_error.rs rename to rustjava-runtime/src/classes/java/lang/no_such_field_error.rs index a6ea28f5..6362dc7f 100644 --- a/java_runtime/src/classes/java/lang/no_such_field_error.rs +++ b/rustjava-runtime/src/classes/java/lang/no_such_field_error.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/no_such_field_exception.rs b/rustjava-runtime/src/classes/java/lang/no_such_field_exception.rs similarity index 93% rename from java_runtime/src/classes/java/lang/no_such_field_exception.rs rename to rustjava-runtime/src/classes/java/lang/no_such_field_exception.rs index b52a7f29..8a94c120 100644 --- a/java_runtime/src/classes/java/lang/no_such_field_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/no_such_field_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/no_such_method_error.rs b/rustjava-runtime/src/classes/java/lang/no_such_method_error.rs similarity index 94% rename from java_runtime/src/classes/java/lang/no_such_method_error.rs rename to rustjava-runtime/src/classes/java/lang/no_such_method_error.rs index ec51b1cb..7fbb3a6c 100644 --- a/java_runtime/src/classes/java/lang/no_such_method_error.rs +++ b/rustjava-runtime/src/classes/java/lang/no_such_method_error.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/no_such_method_exception.rs b/rustjava-runtime/src/classes/java/lang/no_such_method_exception.rs similarity index 93% rename from java_runtime/src/classes/java/lang/no_such_method_exception.rs rename to rustjava-runtime/src/classes/java/lang/no_such_method_exception.rs index a921ba2f..752074d9 100644 --- a/java_runtime/src/classes/java/lang/no_such_method_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/no_such_method_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/null_pointer_exception.rs b/rustjava-runtime/src/classes/java/lang/null_pointer_exception.rs similarity index 94% rename from java_runtime/src/classes/java/lang/null_pointer_exception.rs rename to rustjava-runtime/src/classes/java/lang/null_pointer_exception.rs index def52367..bda6b67e 100644 --- a/java_runtime/src/classes/java/lang/null_pointer_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/null_pointer_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/number.rs b/rustjava-runtime/src/classes/java/lang/number.rs similarity index 95% rename from java_runtime/src/classes/java/lang/number.rs rename to rustjava-runtime/src/classes/java/lang/number.rs index 32859eb8..1562af54 100644 --- a/java_runtime/src/classes/java/lang/number.rs +++ b/rustjava-runtime/src/classes/java/lang/number.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext}; diff --git a/java_runtime/src/classes/java/lang/number_format_exception.rs b/rustjava-runtime/src/classes/java/lang/number_format_exception.rs similarity index 94% rename from java_runtime/src/classes/java/lang/number_format_exception.rs rename to rustjava-runtime/src/classes/java/lang/number_format_exception.rs index ee0e6b4a..22a439d8 100644 --- a/java_runtime/src/classes/java/lang/number_format_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/number_format_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/object.rs b/rustjava-runtime/src/classes/java/lang/object.rs similarity index 98% rename from java_runtime/src/classes/java/lang/object.rs rename to rustjava-runtime/src/classes/java/lang/object.rs index 4a760df2..036c1145 100644 --- a/java_runtime/src/classes/java/lang/object.rs +++ b/rustjava-runtime/src/classes/java/lang/object.rs @@ -6,9 +6,9 @@ use core::{ use alloc::{boxed::Box, format, vec}; use dyn_clone::clone_box; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstance, ClassInstanceRef, Jvm, MonitorWaitTimeout, Result, runtime::JavaLangString}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{Runtime, RuntimeClassProto, RuntimeContext, SpawnCallback, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/out_of_memory_error.rs b/rustjava-runtime/src/classes/java/lang/out_of_memory_error.rs similarity index 93% rename from java_runtime/src/classes/java/lang/out_of_memory_error.rs rename to rustjava-runtime/src/classes/java/lang/out_of_memory_error.rs index aa35d904..20f60fe1 100644 --- a/java_runtime/src/classes/java/lang/out_of_memory_error.rs +++ b/rustjava-runtime/src/classes/java/lang/out_of_memory_error.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/runnable.rs b/rustjava-runtime/src/classes/java/lang/runnable.rs similarity index 85% rename from java_runtime/src/classes/java/lang/runnable.rs rename to rustjava-runtime/src/classes/java/lang/runnable.rs index 479f4033..c6c9f6a1 100644 --- a/java_runtime/src/classes/java/lang/runnable.rs +++ b/rustjava-runtime/src/classes/java/lang/runnable.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/lang/runtime.rs b/rustjava-runtime/src/classes/java/lang/runtime.rs similarity index 96% rename from java_runtime/src/classes/java/lang/runtime.rs rename to rustjava-runtime/src/classes/java/lang/runtime.rs index 66a79937..aee3bc66 100644 --- a/java_runtime/src/classes/java/lang/runtime.rs +++ b/rustjava-runtime/src/classes/java/lang/runtime.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext}; diff --git a/java_runtime/src/classes/java/lang/runtime_exception.rs b/rustjava-runtime/src/classes/java/lang/runtime_exception.rs similarity index 96% rename from java_runtime/src/classes/java/lang/runtime_exception.rs rename to rustjava-runtime/src/classes/java/lang/runtime_exception.rs index 6a2c2692..92933139 100644 --- a/java_runtime/src/classes/java/lang/runtime_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/runtime_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang/security_exception.rs b/rustjava-runtime/src/classes/java/lang/security_exception.rs similarity index 93% rename from java_runtime/src/classes/java/lang/security_exception.rs rename to rustjava-runtime/src/classes/java/lang/security_exception.rs index a962bac6..dbac302c 100644 --- a/java_runtime/src/classes/java/lang/security_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/security_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/short.rs b/rustjava-runtime/src/classes/java/lang/short.rs similarity index 98% rename from java_runtime/src/classes/java/lang/short.rs rename to rustjava-runtime/src/classes/java/lang/short.rs index e4feae81..6a2bce2c 100644 --- a/java_runtime/src/classes/java/lang/short.rs +++ b/rustjava-runtime/src/classes/java/lang/short.rs @@ -1,11 +1,11 @@ use alloc::{format, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ ClassInstanceRef, Jvm, Result, runtime::{JavaLangClass, JavaLangString}, }; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang/stack_overflow_error.rs b/rustjava-runtime/src/classes/java/lang/stack_overflow_error.rs similarity index 93% rename from java_runtime/src/classes/java/lang/stack_overflow_error.rs rename to rustjava-runtime/src/classes/java/lang/stack_overflow_error.rs index 04c9e89c..fee5615f 100644 --- a/java_runtime/src/classes/java/lang/stack_overflow_error.rs +++ b/rustjava-runtime/src/classes/java/lang/stack_overflow_error.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/string.rs b/rustjava-runtime/src/classes/java/lang/string.rs similarity index 99% rename from java_runtime/src/classes/java/lang/string.rs rename to rustjava-runtime/src/classes/java/lang/string.rs index c4f5aa8f..c30b9f77 100644 --- a/java_runtime/src/classes/java/lang/string.rs +++ b/rustjava-runtime/src/classes/java/lang/string.rs @@ -7,9 +7,9 @@ use alloc::{ use bytemuck::{cast_slice, cast_vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaChar, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang/string_buffer.rs b/rustjava-runtime/src/classes/java/lang/string_buffer.rs similarity index 99% rename from java_runtime/src/classes/java/lang/string_buffer.rs rename to rustjava-runtime/src/classes/java/lang/string_buffer.rs index aeb5f322..58fdc7cf 100644 --- a/java_runtime/src/classes/java/lang/string_buffer.rs +++ b/rustjava-runtime/src/classes/java/lang/string_buffer.rs @@ -1,8 +1,8 @@ use alloc::{string::ToString, vec, vec::Vec}; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaChar, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang/string_builder.rs b/rustjava-runtime/src/classes/java/lang/string_builder.rs similarity index 99% rename from java_runtime/src/classes/java/lang/string_builder.rs rename to rustjava-runtime/src/classes/java/lang/string_builder.rs index 3cfaff67..a7ea4d48 100644 --- a/java_runtime/src/classes/java/lang/string_builder.rs +++ b/rustjava-runtime/src/classes/java/lang/string_builder.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaChar, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang/string_index_out_of_bounds_exception.rs b/rustjava-runtime/src/classes/java/lang/string_index_out_of_bounds_exception.rs similarity index 94% rename from java_runtime/src/classes/java/lang/string_index_out_of_bounds_exception.rs rename to rustjava-runtime/src/classes/java/lang/string_index_out_of_bounds_exception.rs index 684b172a..5af5aa65 100644 --- a/java_runtime/src/classes/java/lang/string_index_out_of_bounds_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/string_index_out_of_bounds_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/system.rs b/rustjava-runtime/src/classes/java/lang/system.rs similarity index 98% rename from java_runtime/src/classes/java/lang/system.rs rename to rustjava-runtime/src/classes/java/lang/system.rs index 053e6739..d366913a 100644 --- a/java_runtime/src/classes/java/lang/system.rs +++ b/rustjava-runtime/src/classes/java/lang/system.rs @@ -2,9 +2,9 @@ use alloc::{string::String as RustString, vec, vec::Vec}; use jvm::{JavaValue, runtime::JavaLangString}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang/thread.rs b/rustjava-runtime/src/classes/java/lang/thread.rs similarity index 99% rename from java_runtime/src/classes/java/lang/thread.rs rename to rustjava-runtime/src/classes/java/lang/thread.rs index adf1e138..4032d142 100644 --- a/java_runtime/src/classes/java/lang/thread.rs +++ b/rustjava-runtime/src/classes/java/lang/thread.rs @@ -1,9 +1,9 @@ use alloc::{boxed::Box, format, vec}; use core::time::Duration; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, GlobalRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{FieldAccessFlags, MethodAccessFlags}; use tracing::Instrument; use crate::{ @@ -139,7 +139,7 @@ impl Thread { JavaFieldProto::new("alive", "Z", FieldAccessFlags::PRIVATE), JavaFieldProto::new("daemon", "Z", FieldAccessFlags::PRIVATE), ], - access_flags: java_constants::ClassAccessFlags::PUBLIC, + access_flags: jvm_types::ClassAccessFlags::PUBLIC, } } diff --git a/java_runtime/src/classes/java/lang/thread_death.rs b/rustjava-runtime/src/classes/java/lang/thread_death.rs similarity index 89% rename from java_runtime/src/classes/java/lang/thread_death.rs rename to rustjava-runtime/src/classes/java/lang/thread_death.rs index d8ac69e5..808b409c 100644 --- a/java_runtime/src/classes/java/lang/thread_death.rs +++ b/rustjava-runtime/src/classes/java/lang/thread_death.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext}; diff --git a/java_runtime/src/classes/java/lang/throwable.rs b/rustjava-runtime/src/classes/java/lang/throwable.rs similarity index 99% rename from java_runtime/src/classes/java/lang/throwable.rs rename to rustjava-runtime/src/classes/java/lang/throwable.rs index 5d231258..9b7d2502 100644 --- a/java_runtime/src/classes/java/lang/throwable.rs +++ b/rustjava-runtime/src/classes/java/lang/throwable.rs @@ -1,8 +1,8 @@ use alloc::{boxed::Box, format, vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstance, ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/lang/unknown_error.rs b/rustjava-runtime/src/classes/java/lang/unknown_error.rs similarity index 93% rename from java_runtime/src/classes/java/lang/unknown_error.rs rename to rustjava-runtime/src/classes/java/lang/unknown_error.rs index 8e979b7b..4fea3331 100644 --- a/java_runtime/src/classes/java/lang/unknown_error.rs +++ b/rustjava-runtime/src/classes/java/lang/unknown_error.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/unsatisfied_link_error.rs b/rustjava-runtime/src/classes/java/lang/unsatisfied_link_error.rs similarity index 93% rename from java_runtime/src/classes/java/lang/unsatisfied_link_error.rs rename to rustjava-runtime/src/classes/java/lang/unsatisfied_link_error.rs index e74da04b..8c9ee353 100644 --- a/java_runtime/src/classes/java/lang/unsatisfied_link_error.rs +++ b/rustjava-runtime/src/classes/java/lang/unsatisfied_link_error.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/unsupported_class_version_error.rs b/rustjava-runtime/src/classes/java/lang/unsupported_class_version_error.rs similarity index 94% rename from java_runtime/src/classes/java/lang/unsupported_class_version_error.rs rename to rustjava-runtime/src/classes/java/lang/unsupported_class_version_error.rs index bdaa2f9c..ecdde678 100644 --- a/java_runtime/src/classes/java/lang/unsupported_class_version_error.rs +++ b/rustjava-runtime/src/classes/java/lang/unsupported_class_version_error.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/unsupported_operation_exception.rs b/rustjava-runtime/src/classes/java/lang/unsupported_operation_exception.rs similarity index 94% rename from java_runtime/src/classes/java/lang/unsupported_operation_exception.rs rename to rustjava-runtime/src/classes/java/lang/unsupported_operation_exception.rs index 376edecb..b5aab59d 100644 --- a/java_runtime/src/classes/java/lang/unsupported_operation_exception.rs +++ b/rustjava-runtime/src/classes/java/lang/unsupported_operation_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/verify_error.rs b/rustjava-runtime/src/classes/java/lang/verify_error.rs similarity index 93% rename from java_runtime/src/classes/java/lang/verify_error.rs rename to rustjava-runtime/src/classes/java/lang/verify_error.rs index 3542f033..74a68042 100644 --- a/java_runtime/src/classes/java/lang/verify_error.rs +++ b/rustjava-runtime/src/classes/java/lang/verify_error.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/lang/virtual_machine_error.rs b/rustjava-runtime/src/classes/java/lang/virtual_machine_error.rs similarity index 93% rename from java_runtime/src/classes/java/lang/virtual_machine_error.rs rename to rustjava-runtime/src/classes/java/lang/virtual_machine_error.rs index 325e494f..4bc8de6a 100644 --- a/java_runtime/src/classes/java/lang/virtual_machine_error.rs +++ b/rustjava-runtime/src/classes/java/lang/virtual_machine_error.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/net.rs b/rustjava-runtime/src/classes/java/net.rs similarity index 100% rename from java_runtime/src/classes/java/net.rs rename to rustjava-runtime/src/classes/java/net.rs diff --git a/java_runtime/src/classes/java/net/jar_url_connection.rs b/rustjava-runtime/src/classes/java/net/jar_url_connection.rs similarity index 97% rename from java_runtime/src/classes/java/net/jar_url_connection.rs rename to rustjava-runtime/src/classes/java/net/jar_url_connection.rs index 54ad4172..1b6b950b 100644 --- a/java_runtime/src/classes/java/net/jar_url_connection.rs +++ b/rustjava-runtime/src/classes/java/net/jar_url_connection.rs @@ -1,8 +1,8 @@ use alloc::{vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/net/malformed_url_exception.rs b/rustjava-runtime/src/classes/java/net/malformed_url_exception.rs similarity index 93% rename from java_runtime/src/classes/java/net/malformed_url_exception.rs rename to rustjava-runtime/src/classes/java/net/malformed_url_exception.rs index cfb606a6..94fa346d 100644 --- a/java_runtime/src/classes/java/net/malformed_url_exception.rs +++ b/rustjava-runtime/src/classes/java/net/malformed_url_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/net/unknown_service_exception.rs b/rustjava-runtime/src/classes/java/net/unknown_service_exception.rs similarity index 93% rename from java_runtime/src/classes/java/net/unknown_service_exception.rs rename to rustjava-runtime/src/classes/java/net/unknown_service_exception.rs index 9f17beb9..f7fb1f9f 100644 --- a/java_runtime/src/classes/java/net/unknown_service_exception.rs +++ b/rustjava-runtime/src/classes/java/net/unknown_service_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/net/url.rs b/rustjava-runtime/src/classes/java/net/url.rs similarity index 98% rename from java_runtime/src/classes/java/net/url.rs rename to rustjava-runtime/src/classes/java/net/url.rs index 74556491..cd21bde8 100644 --- a/java_runtime/src/classes/java/net/url.rs +++ b/rustjava-runtime/src/classes/java/net/url.rs @@ -1,8 +1,8 @@ use alloc::{format, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/net/url_class_loader.rs b/rustjava-runtime/src/classes/java/net/url_class_loader.rs similarity index 98% rename from java_runtime/src/classes/java/net/url_class_loader.rs rename to rustjava-runtime/src/classes/java/net/url_class_loader.rs index c817b5b1..a1978e95 100644 --- a/java_runtime/src/classes/java/net/url_class_loader.rs +++ b/rustjava-runtime/src/classes/java/net/url_class_loader.rs @@ -1,11 +1,11 @@ use alloc::{format, vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ Array, ClassInstanceRef, Jvm, Result, runtime::{JavaIoInputStream, JavaLangString}, }; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ FileType, RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/net/url_connection.rs b/rustjava-runtime/src/classes/java/net/url_connection.rs similarity index 92% rename from java_runtime/src/classes/java/net/url_connection.rs rename to rustjava-runtime/src/classes/java/net/url_connection.rs index 429d66b8..0ed978f3 100644 --- a/java_runtime/src/classes/java/net/url_connection.rs +++ b/rustjava-runtime/src/classes/java/net/url_connection.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/net/url_stream_handler.rs b/rustjava-runtime/src/classes/java/net/url_stream_handler.rs similarity index 97% rename from java_runtime/src/classes/java/net/url_stream_handler.rs rename to rustjava-runtime/src/classes/java/net/url_stream_handler.rs index 5c2f3456..07a46979 100644 --- a/java_runtime/src/classes/java/net/url_stream_handler.rs +++ b/rustjava-runtime/src/classes/java/net/url_stream_handler.rs @@ -1,10 +1,10 @@ use alloc::{borrow::ToOwned, string::ToString, vec}; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use url::Url; -use java_class_proto::JavaMethodProto; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::JavaMethodProto; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/text.rs b/rustjava-runtime/src/classes/java/text.rs similarity index 100% rename from java_runtime/src/classes/java/text.rs rename to rustjava-runtime/src/classes/java/text.rs diff --git a/java_runtime/src/classes/java/text/date_format.rs b/rustjava-runtime/src/classes/java/text/date_format.rs similarity index 99% rename from java_runtime/src/classes/java/text/date_format.rs rename to rustjava-runtime/src/classes/java/text/date_format.rs index c52d5dc9..14c1c450 100644 --- a/java_runtime/src/classes/java/text/date_format.rs +++ b/rustjava-runtime/src/classes/java/text/date_format.rs @@ -1,8 +1,8 @@ use alloc::{format, string::ToString, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaError, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/text/decimal_format.rs b/rustjava-runtime/src/classes/java/text/decimal_format.rs similarity index 99% rename from java_runtime/src/classes/java/text/decimal_format.rs rename to rustjava-runtime/src/classes/java/text/decimal_format.rs index cc52068d..915c0837 100644 --- a/java_runtime/src/classes/java/text/decimal_format.rs +++ b/rustjava-runtime/src/classes/java/text/decimal_format.rs @@ -5,9 +5,9 @@ use alloc::{ vec::Vec, }; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/text/field_position.rs b/rustjava-runtime/src/classes/java/text/field_position.rs similarity index 97% rename from java_runtime/src/classes/java/text/field_position.rs rename to rustjava-runtime/src/classes/java/text/field_position.rs index 1f67d10a..52b01564 100644 --- a/java_runtime/src/classes/java/text/field_position.rs +++ b/rustjava-runtime/src/classes/java/text/field_position.rs @@ -1,8 +1,8 @@ use alloc::{format, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/text/format.rs b/rustjava-runtime/src/classes/java/text/format.rs similarity index 98% rename from java_runtime/src/classes/java/text/format.rs rename to rustjava-runtime/src/classes/java/text/format.rs index 94b82a76..0e88aaec 100644 --- a/java_runtime/src/classes/java/text/format.rs +++ b/rustjava-runtime/src/classes/java/text/format.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, JavaError, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/text/number_format.rs b/rustjava-runtime/src/classes/java/text/number_format.rs similarity index 99% rename from java_runtime/src/classes/java/text/number_format.rs rename to rustjava-runtime/src/classes/java/text/number_format.rs index 741d002f..ab467160 100644 --- a/java_runtime/src/classes/java/text/number_format.rs +++ b/rustjava-runtime/src/classes/java/text/number_format.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaError, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/text/parse_exception.rs b/rustjava-runtime/src/classes/java/text/parse_exception.rs similarity index 91% rename from java_runtime/src/classes/java/text/parse_exception.rs rename to rustjava-runtime/src/classes/java/text/parse_exception.rs index fc5fc011..14d2c2b1 100644 --- a/java_runtime/src/classes/java/text/parse_exception.rs +++ b/rustjava-runtime/src/classes/java/text/parse_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/text/parse_position.rs b/rustjava-runtime/src/classes/java/text/parse_position.rs similarity index 96% rename from java_runtime/src/classes/java/text/parse_position.rs rename to rustjava-runtime/src/classes/java/text/parse_position.rs index e57f392c..c03d9560 100644 --- a/java_runtime/src/classes/java/text/parse_position.rs +++ b/rustjava-runtime/src/classes/java/text/parse_position.rs @@ -1,8 +1,8 @@ use alloc::{format, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/text/simple_date_format.rs b/rustjava-runtime/src/classes/java/text/simple_date_format.rs similarity index 99% rename from java_runtime/src/classes/java/text/simple_date_format.rs rename to rustjava-runtime/src/classes/java/text/simple_date_format.rs index f7fc60e5..634d2c42 100644 --- a/java_runtime/src/classes/java/text/simple_date_format.rs +++ b/rustjava-runtime/src/classes/java/text/simple_date_format.rs @@ -1,9 +1,9 @@ use alloc::{format, string::String as RustString, vec, vec::Vec}; use chrono::{DateTime, Datelike, NaiveDate, TimeZone as ChronoTimeZone, Timelike, Utc}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util.rs b/rustjava-runtime/src/classes/java/util.rs similarity index 100% rename from java_runtime/src/classes/java/util.rs rename to rustjava-runtime/src/classes/java/util.rs diff --git a/java_runtime/src/classes/java/util/abstract_collection.rs b/rustjava-runtime/src/classes/java/util/abstract_collection.rs similarity index 99% rename from java_runtime/src/classes/java/util/abstract_collection.rs rename to rustjava-runtime/src/classes/java/util/abstract_collection.rs index 4818c2ea..a12400ae 100644 --- a/java_runtime/src/classes/java/util/abstract_collection.rs +++ b/rustjava-runtime/src/classes/java/util/abstract_collection.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{Array, AsClassInstance, ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/abstract_list.rs b/rustjava-runtime/src/classes/java/util/abstract_list.rs similarity index 99% rename from java_runtime/src/classes/java/util/abstract_list.rs rename to rustjava-runtime/src/classes/java/util/abstract_list.rs index afbde8d8..3e2ee256 100644 --- a/java_runtime/src/classes/java/util/abstract_list.rs +++ b/rustjava-runtime/src/classes/java/util/abstract_list.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/abstract_list_sub_list.rs b/rustjava-runtime/src/classes/java/util/abstract_list_sub_list.rs similarity index 99% rename from java_runtime/src/classes/java/util/abstract_list_sub_list.rs rename to rustjava-runtime/src/classes/java/util/abstract_list_sub_list.rs index 54d9f5ff..55db9ac4 100644 --- a/java_runtime/src/classes/java/util/abstract_list_sub_list.rs +++ b/rustjava-runtime/src/classes/java/util/abstract_list_sub_list.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/abstract_map.rs b/rustjava-runtime/src/classes/java/util/abstract_map.rs similarity index 99% rename from java_runtime/src/classes/java/util/abstract_map.rs rename to rustjava-runtime/src/classes/java/util/abstract_map.rs index 025f638b..0036dee6 100644 --- a/java_runtime/src/classes/java/util/abstract_map.rs +++ b/rustjava-runtime/src/classes/java/util/abstract_map.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaError, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/abstract_set.rs b/rustjava-runtime/src/classes/java/util/abstract_set.rs similarity index 97% rename from java_runtime/src/classes/java/util/abstract_set.rs rename to rustjava-runtime/src/classes/java/util/abstract_set.rs index 53fdf62d..fe6d6f46 100644 --- a/java_runtime/src/classes/java/util/abstract_set.rs +++ b/rustjava-runtime/src/classes/java/util/abstract_set.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, JavaError, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/array_list.rs b/rustjava-runtime/src/classes/java/util/array_list.rs similarity index 99% rename from java_runtime/src/classes/java/util/array_list.rs rename to rustjava-runtime/src/classes/java/util/array_list.rs index 389f6f44..2a465805 100644 --- a/java_runtime/src/classes/java/util/array_list.rs +++ b/rustjava-runtime/src/classes/java/util/array_list.rs @@ -1,8 +1,8 @@ use alloc::{format, vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/array_list_itr.rs b/rustjava-runtime/src/classes/java/util/array_list_itr.rs similarity index 98% rename from java_runtime/src/classes/java/util/array_list_itr.rs rename to rustjava-runtime/src/classes/java/util/array_list_itr.rs index a71e2752..1478438d 100644 --- a/java_runtime/src/classes/java/util/array_list_itr.rs +++ b/rustjava-runtime/src/classes/java/util/array_list_itr.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/arrays.rs b/rustjava-runtime/src/classes/java/util/arrays.rs similarity index 99% rename from java_runtime/src/classes/java/util/arrays.rs rename to rustjava-runtime/src/classes/java/util/arrays.rs index 66dfdcbb..98e37700 100644 --- a/java_runtime/src/classes/java/util/arrays.rs +++ b/rustjava-runtime/src/classes/java/util/arrays.rs @@ -1,9 +1,9 @@ use alloc::vec; use core::cmp::Ordering; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaChar, JavaValue, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/arrays_array_list.rs b/rustjava-runtime/src/classes/java/util/arrays_array_list.rs similarity index 97% rename from java_runtime/src/classes/java/util/arrays_array_list.rs rename to rustjava-runtime/src/classes/java/util/arrays_array_list.rs index b1eb07cd..191a8dd7 100644 --- a/java_runtime/src/classes/java/util/arrays_array_list.rs +++ b/rustjava-runtime/src/classes/java/util/arrays_array_list.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, AsClassInstance, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/calendar.rs b/rustjava-runtime/src/classes/java/util/calendar.rs similarity index 99% rename from java_runtime/src/classes/java/util/calendar.rs rename to rustjava-runtime/src/classes/java/util/calendar.rs index 386a760c..264c1833 100644 --- a/java_runtime/src/classes/java/util/calendar.rs +++ b/rustjava-runtime/src/classes/java/util/calendar.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/collection.rs b/rustjava-runtime/src/classes/java/util/collection.rs similarity index 96% rename from java_runtime/src/classes/java/util/collection.rs rename to rustjava-runtime/src/classes/java/util/collection.rs index 30f8ac6b..0997da0c 100644 --- a/java_runtime/src/classes/java/util/collection.rs +++ b/rustjava-runtime/src/classes/java/util/collection.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/util/collections.rs b/rustjava-runtime/src/classes/java/util/collections.rs similarity index 99% rename from java_runtime/src/classes/java/util/collections.rs rename to rustjava-runtime/src/classes/java/util/collections.rs index cfddadc0..455c8f2c 100644 --- a/java_runtime/src/classes/java/util/collections.rs +++ b/rustjava-runtime/src/classes/java/util/collections.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/collections_copies_list.rs b/rustjava-runtime/src/classes/java/util/collections_copies_list.rs similarity index 98% rename from java_runtime/src/classes/java/util/collections_copies_list.rs rename to rustjava-runtime/src/classes/java/util/collections_copies_list.rs index f06b448e..184d5032 100644 --- a/java_runtime/src/classes/java/util/collections_copies_list.rs +++ b/rustjava-runtime/src/classes/java/util/collections_copies_list.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/collections_empty_list.rs b/rustjava-runtime/src/classes/java/util/collections_empty_list.rs similarity index 97% rename from java_runtime/src/classes/java/util/collections_empty_list.rs rename to rustjava-runtime/src/classes/java/util/collections_empty_list.rs index 82e406ae..3ccea17f 100644 --- a/java_runtime/src/classes/java/util/collections_empty_list.rs +++ b/rustjava-runtime/src/classes/java/util/collections_empty_list.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/collections_empty_set.rs b/rustjava-runtime/src/classes/java/util/collections_empty_set.rs similarity index 96% rename from java_runtime/src/classes/java/util/collections_empty_set.rs rename to rustjava-runtime/src/classes/java/util/collections_empty_set.rs index 97bdd55b..b319689e 100644 --- a/java_runtime/src/classes/java/util/collections_empty_set.rs +++ b/rustjava-runtime/src/classes/java/util/collections_empty_set.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/collections_singleton_set.rs b/rustjava-runtime/src/classes/java/util/collections_singleton_set.rs similarity index 97% rename from java_runtime/src/classes/java/util/collections_singleton_set.rs rename to rustjava-runtime/src/classes/java/util/collections_singleton_set.rs index c39008e2..720e438c 100644 --- a/java_runtime/src/classes/java/util/collections_singleton_set.rs +++ b/rustjava-runtime/src/classes/java/util/collections_singleton_set.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/collections_unmodifiable_collection.rs b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_collection.rs similarity index 98% rename from java_runtime/src/classes/java/util/collections_unmodifiable_collection.rs rename to rustjava-runtime/src/classes/java/util/collections_unmodifiable_collection.rs index 09d812b5..e3da8482 100644 --- a/java_runtime/src/classes/java/util/collections_unmodifiable_collection.rs +++ b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_collection.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/collections_unmodifiable_collection_iterator.rs b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_collection_iterator.rs similarity index 95% rename from java_runtime/src/classes/java/util/collections_unmodifiable_collection_iterator.rs rename to rustjava-runtime/src/classes/java/util/collections_unmodifiable_collection_iterator.rs index c18731b0..d4a70506 100644 --- a/java_runtime/src/classes/java/util/collections_unmodifiable_collection_iterator.rs +++ b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_collection_iterator.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/collections_unmodifiable_list.rs b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_list.rs similarity index 98% rename from java_runtime/src/classes/java/util/collections_unmodifiable_list.rs rename to rustjava-runtime/src/classes/java/util/collections_unmodifiable_list.rs index 66688dd9..ae93924d 100644 --- a/java_runtime/src/classes/java/util/collections_unmodifiable_list.rs +++ b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_list.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/collections_unmodifiable_list_iterator.rs b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_list_iterator.rs similarity index 97% rename from java_runtime/src/classes/java/util/collections_unmodifiable_list_iterator.rs rename to rustjava-runtime/src/classes/java/util/collections_unmodifiable_list_iterator.rs index 1f55c076..03909e89 100644 --- a/java_runtime/src/classes/java/util/collections_unmodifiable_list_iterator.rs +++ b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_list_iterator.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/collections_unmodifiable_map.rs b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_map.rs similarity index 98% rename from java_runtime/src/classes/java/util/collections_unmodifiable_map.rs rename to rustjava-runtime/src/classes/java/util/collections_unmodifiable_map.rs index 522f61f5..22fa3702 100644 --- a/java_runtime/src/classes/java/util/collections_unmodifiable_map.rs +++ b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_map.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/collections_unmodifiable_map_entry.rs b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_map_entry.rs similarity index 97% rename from java_runtime/src/classes/java/util/collections_unmodifiable_map_entry.rs rename to rustjava-runtime/src/classes/java/util/collections_unmodifiable_map_entry.rs index 6bc2ea7c..148f315b 100644 --- a/java_runtime/src/classes/java/util/collections_unmodifiable_map_entry.rs +++ b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_map_entry.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/collections_unmodifiable_map_entry_set.rs b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_map_entry_set.rs similarity index 98% rename from java_runtime/src/classes/java/util/collections_unmodifiable_map_entry_set.rs rename to rustjava-runtime/src/classes/java/util/collections_unmodifiable_map_entry_set.rs index f8d783b5..cd87476c 100644 --- a/java_runtime/src/classes/java/util/collections_unmodifiable_map_entry_set.rs +++ b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_map_entry_set.rs @@ -1,8 +1,8 @@ use alloc::{vec, vec::Vec}; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{Array, AsClassInstance, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/collections_unmodifiable_map_entry_set_iterator.rs b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_map_entry_set_iterator.rs similarity index 95% rename from java_runtime/src/classes/java/util/collections_unmodifiable_map_entry_set_iterator.rs rename to rustjava-runtime/src/classes/java/util/collections_unmodifiable_map_entry_set_iterator.rs index 05e05e06..026db219 100644 --- a/java_runtime/src/classes/java/util/collections_unmodifiable_map_entry_set_iterator.rs +++ b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_map_entry_set_iterator.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/collections_unmodifiable_set.rs b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_set.rs similarity index 95% rename from java_runtime/src/classes/java/util/collections_unmodifiable_set.rs rename to rustjava-runtime/src/classes/java/util/collections_unmodifiable_set.rs index bf158f54..0cc9b0e0 100644 --- a/java_runtime/src/classes/java/util/collections_unmodifiable_set.rs +++ b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_set.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/collections_unmodifiable_sorted_map.rs b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_sorted_map.rs similarity index 97% rename from java_runtime/src/classes/java/util/collections_unmodifiable_sorted_map.rs rename to rustjava-runtime/src/classes/java/util/collections_unmodifiable_sorted_map.rs index 2d0bef01..407bc03f 100644 --- a/java_runtime/src/classes/java/util/collections_unmodifiable_sorted_map.rs +++ b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_sorted_map.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/collections_unmodifiable_sorted_set.rs b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_sorted_set.rs similarity index 97% rename from java_runtime/src/classes/java/util/collections_unmodifiable_sorted_set.rs rename to rustjava-runtime/src/classes/java/util/collections_unmodifiable_sorted_set.rs index c93e5617..a29d240d 100644 --- a/java_runtime/src/classes/java/util/collections_unmodifiable_sorted_set.rs +++ b/rustjava-runtime/src/classes/java/util/collections_unmodifiable_sorted_set.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/comparator.rs b/rustjava-runtime/src/classes/java/util/comparator.rs similarity index 89% rename from java_runtime/src/classes/java/util/comparator.rs rename to rustjava-runtime/src/classes/java/util/comparator.rs index b78c7ec8..09cd44d6 100644 --- a/java_runtime/src/classes/java/util/comparator.rs +++ b/rustjava-runtime/src/classes/java/util/comparator.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/util/concurrent_modification_exception.rs b/rustjava-runtime/src/classes/java/util/concurrent_modification_exception.rs similarity index 93% rename from java_runtime/src/classes/java/util/concurrent_modification_exception.rs rename to rustjava-runtime/src/classes/java/util/concurrent_modification_exception.rs index e17fd3d6..71d42695 100644 --- a/java_runtime/src/classes/java/util/concurrent_modification_exception.rs +++ b/rustjava-runtime/src/classes/java/util/concurrent_modification_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/util/date.rs b/rustjava-runtime/src/classes/java/util/date.rs similarity index 98% rename from java_runtime/src/classes/java/util/date.rs rename to rustjava-runtime/src/classes/java/util/date.rs index 15fa1d4c..a721c8e1 100644 --- a/java_runtime/src/classes/java/util/date.rs +++ b/rustjava-runtime/src/classes/java/util/date.rs @@ -2,9 +2,9 @@ use alloc::{format, vec}; use chrono::{DateTime, Datelike, Timelike, Utc}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/dictionary.rs b/rustjava-runtime/src/classes/java/util/dictionary.rs similarity index 89% rename from java_runtime/src/classes/java/util/dictionary.rs rename to rustjava-runtime/src/classes/java/util/dictionary.rs index 632a31de..43868840 100644 --- a/java_runtime/src/classes/java/util/dictionary.rs +++ b/rustjava-runtime/src/classes/java/util/dictionary.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext}; diff --git a/java_runtime/src/classes/java/util/duplicate_format_flags_exception.rs b/rustjava-runtime/src/classes/java/util/duplicate_format_flags_exception.rs similarity index 94% rename from java_runtime/src/classes/java/util/duplicate_format_flags_exception.rs rename to rustjava-runtime/src/classes/java/util/duplicate_format_flags_exception.rs index 7d646943..a3a74c61 100644 --- a/java_runtime/src/classes/java/util/duplicate_format_flags_exception.rs +++ b/rustjava-runtime/src/classes/java/util/duplicate_format_flags_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/util/empty_stack_exception.rs b/rustjava-runtime/src/classes/java/util/empty_stack_exception.rs similarity index 93% rename from java_runtime/src/classes/java/util/empty_stack_exception.rs rename to rustjava-runtime/src/classes/java/util/empty_stack_exception.rs index 241f26a9..34925380 100644 --- a/java_runtime/src/classes/java/util/empty_stack_exception.rs +++ b/rustjava-runtime/src/classes/java/util/empty_stack_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/util/enumeration.rs b/rustjava-runtime/src/classes/java/util/enumeration.rs similarity index 89% rename from java_runtime/src/classes/java/util/enumeration.rs rename to rustjava-runtime/src/classes/java/util/enumeration.rs index 7c1f667b..c500c591 100644 --- a/java_runtime/src/classes/java/util/enumeration.rs +++ b/rustjava-runtime/src/classes/java/util/enumeration.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/util/format_flags_conversion_mismatch_exception.rs b/rustjava-runtime/src/classes/java/util/format_flags_conversion_mismatch_exception.rs similarity index 95% rename from java_runtime/src/classes/java/util/format_flags_conversion_mismatch_exception.rs rename to rustjava-runtime/src/classes/java/util/format_flags_conversion_mismatch_exception.rs index 7b0612c9..c8d5d0e5 100644 --- a/java_runtime/src/classes/java/util/format_flags_conversion_mismatch_exception.rs +++ b/rustjava-runtime/src/classes/java/util/format_flags_conversion_mismatch_exception.rs @@ -1,8 +1,8 @@ use alloc::{format, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, JavaChar, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/util/formattable.rs b/rustjava-runtime/src/classes/java/util/formattable.rs similarity index 87% rename from java_runtime/src/classes/java/util/formattable.rs rename to rustjava-runtime/src/classes/java/util/formattable.rs index 201bba65..ac02936f 100644 --- a/java_runtime/src/classes/java/util/formattable.rs +++ b/rustjava-runtime/src/classes/java/util/formattable.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/util/formattable_flags.rs b/rustjava-runtime/src/classes/java/util/formattable_flags.rs similarity index 93% rename from java_runtime/src/classes/java/util/formattable_flags.rs rename to rustjava-runtime/src/classes/java/util/formattable_flags.rs index 816edba3..ef1ecef9 100644 --- a/java_runtime/src/classes/java/util/formattable_flags.rs +++ b/rustjava-runtime/src/classes/java/util/formattable_flags.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext}; diff --git a/java_runtime/src/classes/java/util/formatter.rs b/rustjava-runtime/src/classes/java/util/formatter.rs similarity index 99% rename from java_runtime/src/classes/java/util/formatter.rs rename to rustjava-runtime/src/classes/java/util/formatter.rs index f3648285..75e633a0 100644 --- a/java_runtime/src/classes/java/util/formatter.rs +++ b/rustjava-runtime/src/classes/java/util/formatter.rs @@ -1,9 +1,9 @@ use alloc::{format, string::String as RustString, string::ToString, vec, vec::Vec}; use core::fmt::Write; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/formatter_big_decimal_layout_form.rs b/rustjava-runtime/src/classes/java/util/formatter_big_decimal_layout_form.rs similarity index 97% rename from java_runtime/src/classes/java/util/formatter_big_decimal_layout_form.rs rename to rustjava-runtime/src/classes/java/util/formatter_big_decimal_layout_form.rs index 990bb722..34452511 100644 --- a/java_runtime/src/classes/java/util/formatter_big_decimal_layout_form.rs +++ b/rustjava-runtime/src/classes/java/util/formatter_big_decimal_layout_form.rs @@ -1,8 +1,8 @@ use alloc::{vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/formatter_closed_exception.rs b/rustjava-runtime/src/classes/java/util/formatter_closed_exception.rs similarity index 89% rename from java_runtime/src/classes/java/util/formatter_closed_exception.rs rename to rustjava-runtime/src/classes/java/util/formatter_closed_exception.rs index 4f1d693b..5f46704b 100644 --- a/java_runtime/src/classes/java/util/formatter_closed_exception.rs +++ b/rustjava-runtime/src/classes/java/util/formatter_closed_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext}; diff --git a/java_runtime/src/classes/java/util/gregorian_calendar.rs b/rustjava-runtime/src/classes/java/util/gregorian_calendar.rs similarity index 98% rename from java_runtime/src/classes/java/util/gregorian_calendar.rs rename to rustjava-runtime/src/classes/java/util/gregorian_calendar.rs index 5c5f799f..e87b4c66 100644 --- a/java_runtime/src/classes/java/util/gregorian_calendar.rs +++ b/rustjava-runtime/src/classes/java/util/gregorian_calendar.rs @@ -2,9 +2,9 @@ use alloc::{vec, vec::Vec}; use chrono::{DateTime, Datelike, TimeZone as ChronoTimeZone, Timelike, Utc}; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::util::TimeZone}; diff --git a/java_runtime/src/classes/java/util/hash_map.rs b/rustjava-runtime/src/classes/java/util/hash_map.rs similarity index 99% rename from java_runtime/src/classes/java/util/hash_map.rs rename to rustjava-runtime/src/classes/java/util/hash_map.rs index 0bf5d3af..61e9f93b 100644 --- a/java_runtime/src/classes/java/util/hash_map.rs +++ b/rustjava-runtime/src/classes/java/util/hash_map.rs @@ -1,8 +1,8 @@ use alloc::{format, vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/hash_map_entry.rs b/rustjava-runtime/src/classes/java/util/hash_map_entry.rs similarity index 97% rename from java_runtime/src/classes/java/util/hash_map_entry.rs rename to rustjava-runtime/src/classes/java/util/hash_map_entry.rs index 4c6614eb..bb69090e 100644 --- a/java_runtime/src/classes/java/util/hash_map_entry.rs +++ b/rustjava-runtime/src/classes/java/util/hash_map_entry.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/hash_map_entry_iterator.rs b/rustjava-runtime/src/classes/java/util/hash_map_entry_iterator.rs similarity index 92% rename from java_runtime/src/classes/java/util/hash_map_entry_iterator.rs rename to rustjava-runtime/src/classes/java/util/hash_map_entry_iterator.rs index 0960f7f3..25a994d7 100644 --- a/java_runtime/src/classes/java/util/hash_map_entry_iterator.rs +++ b/rustjava-runtime/src/classes/java/util/hash_map_entry_iterator.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/hash_map_entry_set.rs b/rustjava-runtime/src/classes/java/util/hash_map_entry_set.rs similarity index 98% rename from java_runtime/src/classes/java/util/hash_map_entry_set.rs rename to rustjava-runtime/src/classes/java/util/hash_map_entry_set.rs index 05f1c949..c945632e 100644 --- a/java_runtime/src/classes/java/util/hash_map_entry_set.rs +++ b/rustjava-runtime/src/classes/java/util/hash_map_entry_set.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/hash_map_hash_iterator.rs b/rustjava-runtime/src/classes/java/util/hash_map_hash_iterator.rs similarity index 96% rename from java_runtime/src/classes/java/util/hash_map_hash_iterator.rs rename to rustjava-runtime/src/classes/java/util/hash_map_hash_iterator.rs index b875692c..c97886a1 100644 --- a/java_runtime/src/classes/java/util/hash_map_hash_iterator.rs +++ b/rustjava-runtime/src/classes/java/util/hash_map_hash_iterator.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/hash_map_key_iterator.rs b/rustjava-runtime/src/classes/java/util/hash_map_key_iterator.rs similarity index 92% rename from java_runtime/src/classes/java/util/hash_map_key_iterator.rs rename to rustjava-runtime/src/classes/java/util/hash_map_key_iterator.rs index a7fb6998..a122172f 100644 --- a/java_runtime/src/classes/java/util/hash_map_key_iterator.rs +++ b/rustjava-runtime/src/classes/java/util/hash_map_key_iterator.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/hash_map_key_set.rs b/rustjava-runtime/src/classes/java/util/hash_map_key_set.rs similarity index 97% rename from java_runtime/src/classes/java/util/hash_map_key_set.rs rename to rustjava-runtime/src/classes/java/util/hash_map_key_set.rs index 60da68f6..66eb8eb5 100644 --- a/java_runtime/src/classes/java/util/hash_map_key_set.rs +++ b/rustjava-runtime/src/classes/java/util/hash_map_key_set.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/hash_map_value_iterator.rs b/rustjava-runtime/src/classes/java/util/hash_map_value_iterator.rs similarity index 92% rename from java_runtime/src/classes/java/util/hash_map_value_iterator.rs rename to rustjava-runtime/src/classes/java/util/hash_map_value_iterator.rs index 3b7ea9e6..764ee0e7 100644 --- a/java_runtime/src/classes/java/util/hash_map_value_iterator.rs +++ b/rustjava-runtime/src/classes/java/util/hash_map_value_iterator.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/hash_map_values.rs b/rustjava-runtime/src/classes/java/util/hash_map_values.rs similarity index 97% rename from java_runtime/src/classes/java/util/hash_map_values.rs rename to rustjava-runtime/src/classes/java/util/hash_map_values.rs index 0cf98e8f..9585b09c 100644 --- a/java_runtime/src/classes/java/util/hash_map_values.rs +++ b/rustjava-runtime/src/classes/java/util/hash_map_values.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/hash_set.rs b/rustjava-runtime/src/classes/java/util/hash_set.rs similarity index 98% rename from java_runtime/src/classes/java/util/hash_set.rs rename to rustjava-runtime/src/classes/java/util/hash_set.rs index dfd9b2a4..f71ea793 100644 --- a/java_runtime/src/classes/java/util/hash_set.rs +++ b/rustjava-runtime/src/classes/java/util/hash_set.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/hashtable.rs b/rustjava-runtime/src/classes/java/util/hashtable.rs similarity index 99% rename from java_runtime/src/classes/java/util/hashtable.rs rename to rustjava-runtime/src/classes/java/util/hashtable.rs index 3e7917dd..b640cde2 100644 --- a/java_runtime/src/classes/java/util/hashtable.rs +++ b/rustjava-runtime/src/classes/java/util/hashtable.rs @@ -1,8 +1,8 @@ use alloc::{string::String as RustString, vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaError, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/hashtable_entry.rs b/rustjava-runtime/src/classes/java/util/hashtable_entry.rs similarity index 97% rename from java_runtime/src/classes/java/util/hashtable_entry.rs rename to rustjava-runtime/src/classes/java/util/hashtable_entry.rs index e4593053..f54a6c60 100644 --- a/java_runtime/src/classes/java/util/hashtable_entry.rs +++ b/rustjava-runtime/src/classes/java/util/hashtable_entry.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/hashtable_entry_set.rs b/rustjava-runtime/src/classes/java/util/hashtable_entry_set.rs similarity index 98% rename from java_runtime/src/classes/java/util/hashtable_entry_set.rs rename to rustjava-runtime/src/classes/java/util/hashtable_entry_set.rs index 68a7f3da..c03888e6 100644 --- a/java_runtime/src/classes/java/util/hashtable_entry_set.rs +++ b/rustjava-runtime/src/classes/java/util/hashtable_entry_set.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/hashtable_enumerator.rs b/rustjava-runtime/src/classes/java/util/hashtable_enumerator.rs similarity index 96% rename from java_runtime/src/classes/java/util/hashtable_enumerator.rs rename to rustjava-runtime/src/classes/java/util/hashtable_enumerator.rs index ea950f27..fb6f8426 100644 --- a/java_runtime/src/classes/java/util/hashtable_enumerator.rs +++ b/rustjava-runtime/src/classes/java/util/hashtable_enumerator.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/hashtable_key_set.rs b/rustjava-runtime/src/classes/java/util/hashtable_key_set.rs similarity index 97% rename from java_runtime/src/classes/java/util/hashtable_key_set.rs rename to rustjava-runtime/src/classes/java/util/hashtable_key_set.rs index 929bd9b6..8776260b 100644 --- a/java_runtime/src/classes/java/util/hashtable_key_set.rs +++ b/rustjava-runtime/src/classes/java/util/hashtable_key_set.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/hashtable_values.rs b/rustjava-runtime/src/classes/java/util/hashtable_values.rs similarity index 97% rename from java_runtime/src/classes/java/util/hashtable_values.rs rename to rustjava-runtime/src/classes/java/util/hashtable_values.rs index cd9a27ae..5583e64f 100644 --- a/java_runtime/src/classes/java/util/hashtable_values.rs +++ b/rustjava-runtime/src/classes/java/util/hashtable_values.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/illegal_format_code_point_exception.rs b/rustjava-runtime/src/classes/java/util/illegal_format_code_point_exception.rs similarity index 93% rename from java_runtime/src/classes/java/util/illegal_format_code_point_exception.rs rename to rustjava-runtime/src/classes/java/util/illegal_format_code_point_exception.rs index 59c3a643..4428e849 100644 --- a/java_runtime/src/classes/java/util/illegal_format_code_point_exception.rs +++ b/rustjava-runtime/src/classes/java/util/illegal_format_code_point_exception.rs @@ -1,8 +1,8 @@ use alloc::{format, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/util/illegal_format_conversion_exception.rs b/rustjava-runtime/src/classes/java/util/illegal_format_conversion_exception.rs similarity index 96% rename from java_runtime/src/classes/java/util/illegal_format_conversion_exception.rs rename to rustjava-runtime/src/classes/java/util/illegal_format_conversion_exception.rs index d2904af7..95612548 100644 --- a/java_runtime/src/classes/java/util/illegal_format_conversion_exception.rs +++ b/rustjava-runtime/src/classes/java/util/illegal_format_conversion_exception.rs @@ -1,8 +1,8 @@ use alloc::{format, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, JavaChar, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/illegal_format_exception.rs b/rustjava-runtime/src/classes/java/util/illegal_format_exception.rs similarity index 89% rename from java_runtime/src/classes/java/util/illegal_format_exception.rs rename to rustjava-runtime/src/classes/java/util/illegal_format_exception.rs index f9b271ad..bc9e5e3a 100644 --- a/java_runtime/src/classes/java/util/illegal_format_exception.rs +++ b/rustjava-runtime/src/classes/java/util/illegal_format_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext}; diff --git a/java_runtime/src/classes/java/util/illegal_format_flags_exception.rs b/rustjava-runtime/src/classes/java/util/illegal_format_flags_exception.rs similarity index 94% rename from java_runtime/src/classes/java/util/illegal_format_flags_exception.rs rename to rustjava-runtime/src/classes/java/util/illegal_format_flags_exception.rs index 9aed9c82..74e038af 100644 --- a/java_runtime/src/classes/java/util/illegal_format_flags_exception.rs +++ b/rustjava-runtime/src/classes/java/util/illegal_format_flags_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/util/illegal_format_precision_exception.rs b/rustjava-runtime/src/classes/java/util/illegal_format_precision_exception.rs similarity index 93% rename from java_runtime/src/classes/java/util/illegal_format_precision_exception.rs rename to rustjava-runtime/src/classes/java/util/illegal_format_precision_exception.rs index 934a014e..bf2eb450 100644 --- a/java_runtime/src/classes/java/util/illegal_format_precision_exception.rs +++ b/rustjava-runtime/src/classes/java/util/illegal_format_precision_exception.rs @@ -1,8 +1,8 @@ use alloc::{string::ToString, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/util/illegal_format_width_exception.rs b/rustjava-runtime/src/classes/java/util/illegal_format_width_exception.rs similarity index 93% rename from java_runtime/src/classes/java/util/illegal_format_width_exception.rs rename to rustjava-runtime/src/classes/java/util/illegal_format_width_exception.rs index 601eca27..c7c3e575 100644 --- a/java_runtime/src/classes/java/util/illegal_format_width_exception.rs +++ b/rustjava-runtime/src/classes/java/util/illegal_format_width_exception.rs @@ -1,8 +1,8 @@ use alloc::{string::ToString, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/util/iterator.rs b/rustjava-runtime/src/classes/java/util/iterator.rs similarity index 89% rename from java_runtime/src/classes/java/util/iterator.rs rename to rustjava-runtime/src/classes/java/util/iterator.rs index c25a57c3..deb0d5af 100644 --- a/java_runtime/src/classes/java/util/iterator.rs +++ b/rustjava-runtime/src/classes/java/util/iterator.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/util/jar.rs b/rustjava-runtime/src/classes/java/util/jar.rs similarity index 100% rename from java_runtime/src/classes/java/util/jar.rs rename to rustjava-runtime/src/classes/java/util/jar.rs diff --git a/java_runtime/src/classes/java/util/jar/attributes.rs b/rustjava-runtime/src/classes/java/util/jar/attributes.rs similarity index 95% rename from java_runtime/src/classes/java/util/jar/attributes.rs rename to rustjava-runtime/src/classes/java/util/jar/attributes.rs index 91bdfbba..8408cd01 100644 --- a/java_runtime/src/classes/java/util/jar/attributes.rs +++ b/rustjava-runtime/src/classes/java/util/jar/attributes.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/util/jar/jar_entry.rs b/rustjava-runtime/src/classes/java/util/jar/jar_entry.rs similarity index 91% rename from java_runtime/src/classes/java/util/jar/jar_entry.rs rename to rustjava-runtime/src/classes/java/util/jar/jar_entry.rs index 0ed2eddf..0b3c06ad 100644 --- a/java_runtime/src/classes/java/util/jar/jar_entry.rs +++ b/rustjava-runtime/src/classes/java/util/jar/jar_entry.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::util::zip::ZipEntry}; diff --git a/java_runtime/src/classes/java/util/jar/jar_file.rs b/rustjava-runtime/src/classes/java/util/jar/jar_file.rs similarity index 98% rename from java_runtime/src/classes/java/util/jar/jar_file.rs rename to rustjava-runtime/src/classes/java/util/jar/jar_file.rs index 3d53fae6..36998582 100644 --- a/java_runtime/src/classes/java/util/jar/jar_file.rs +++ b/rustjava-runtime/src/classes/java/util/jar/jar_file.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/jar/jar_file_entries.rs b/rustjava-runtime/src/classes/java/util/jar/jar_file_entries.rs similarity index 95% rename from java_runtime/src/classes/java/util/jar/jar_file_entries.rs rename to rustjava-runtime/src/classes/java/util/jar/jar_file_entries.rs index 000d6684..b872d65a 100644 --- a/java_runtime/src/classes/java/util/jar/jar_file_entries.rs +++ b/rustjava-runtime/src/classes/java/util/jar/jar_file_entries.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/jar/manifest.rs b/rustjava-runtime/src/classes/java/util/jar/manifest.rs similarity index 96% rename from java_runtime/src/classes/java/util/jar/manifest.rs rename to rustjava-runtime/src/classes/java/util/jar/manifest.rs index c937f870..e6034164 100644 --- a/java_runtime/src/classes/java/util/jar/manifest.rs +++ b/rustjava-runtime/src/classes/java/util/jar/manifest.rs @@ -1,8 +1,8 @@ use alloc::{vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/linked_hash_map.rs b/rustjava-runtime/src/classes/java/util/linked_hash_map.rs similarity index 99% rename from java_runtime/src/classes/java/util/linked_hash_map.rs rename to rustjava-runtime/src/classes/java/util/linked_hash_map.rs index 6716ee7d..6067a6a7 100644 --- a/java_runtime/src/classes/java/util/linked_hash_map.rs +++ b/rustjava-runtime/src/classes/java/util/linked_hash_map.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/linked_hash_map_entry.rs b/rustjava-runtime/src/classes/java/util/linked_hash_map_entry.rs similarity index 96% rename from java_runtime/src/classes/java/util/linked_hash_map_entry.rs rename to rustjava-runtime/src/classes/java/util/linked_hash_map_entry.rs index 1f1c5cc1..822af990 100644 --- a/java_runtime/src/classes/java/util/linked_hash_map_entry.rs +++ b/rustjava-runtime/src/classes/java/util/linked_hash_map_entry.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/linked_hash_map_entry_iterator.rs b/rustjava-runtime/src/classes/java/util/linked_hash_map_entry_iterator.rs similarity index 94% rename from java_runtime/src/classes/java/util/linked_hash_map_entry_iterator.rs rename to rustjava-runtime/src/classes/java/util/linked_hash_map_entry_iterator.rs index d24834f1..f8041514 100644 --- a/java_runtime/src/classes/java/util/linked_hash_map_entry_iterator.rs +++ b/rustjava-runtime/src/classes/java/util/linked_hash_map_entry_iterator.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/linked_hash_map_key_iterator.rs b/rustjava-runtime/src/classes/java/util/linked_hash_map_key_iterator.rs similarity index 94% rename from java_runtime/src/classes/java/util/linked_hash_map_key_iterator.rs rename to rustjava-runtime/src/classes/java/util/linked_hash_map_key_iterator.rs index 38bda00d..71549b3b 100644 --- a/java_runtime/src/classes/java/util/linked_hash_map_key_iterator.rs +++ b/rustjava-runtime/src/classes/java/util/linked_hash_map_key_iterator.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/linked_hash_map_linked_hash_iterator.rs b/rustjava-runtime/src/classes/java/util/linked_hash_map_linked_hash_iterator.rs similarity index 97% rename from java_runtime/src/classes/java/util/linked_hash_map_linked_hash_iterator.rs rename to rustjava-runtime/src/classes/java/util/linked_hash_map_linked_hash_iterator.rs index 5868604d..40ee5937 100644 --- a/java_runtime/src/classes/java/util/linked_hash_map_linked_hash_iterator.rs +++ b/rustjava-runtime/src/classes/java/util/linked_hash_map_linked_hash_iterator.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/linked_hash_map_value_iterator.rs b/rustjava-runtime/src/classes/java/util/linked_hash_map_value_iterator.rs similarity index 94% rename from java_runtime/src/classes/java/util/linked_hash_map_value_iterator.rs rename to rustjava-runtime/src/classes/java/util/linked_hash_map_value_iterator.rs index eb281ac6..f1bdbed3 100644 --- a/java_runtime/src/classes/java/util/linked_hash_map_value_iterator.rs +++ b/rustjava-runtime/src/classes/java/util/linked_hash_map_value_iterator.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/linked_list.rs b/rustjava-runtime/src/classes/java/util/linked_list.rs similarity index 99% rename from java_runtime/src/classes/java/util/linked_list.rs rename to rustjava-runtime/src/classes/java/util/linked_list.rs index 11dd9bb5..0c1f2dbe 100644 --- a/java_runtime/src/classes/java/util/linked_list.rs +++ b/rustjava-runtime/src/classes/java/util/linked_list.rs @@ -1,8 +1,8 @@ use alloc::{format, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/linked_list_entry.rs b/rustjava-runtime/src/classes/java/util/linked_list_entry.rs similarity index 92% rename from java_runtime/src/classes/java/util/linked_list_entry.rs rename to rustjava-runtime/src/classes/java/util/linked_list_entry.rs index d86016e5..6698c80f 100644 --- a/java_runtime/src/classes/java/util/linked_list_entry.rs +++ b/rustjava-runtime/src/classes/java/util/linked_list_entry.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/linked_list_itr.rs b/rustjava-runtime/src/classes/java/util/linked_list_itr.rs similarity index 98% rename from java_runtime/src/classes/java/util/linked_list_itr.rs rename to rustjava-runtime/src/classes/java/util/linked_list_itr.rs index 992fdcd0..b382dc85 100644 --- a/java_runtime/src/classes/java/util/linked_list_itr.rs +++ b/rustjava-runtime/src/classes/java/util/linked_list_itr.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/list.rs b/rustjava-runtime/src/classes/java/util/list.rs similarity index 96% rename from java_runtime/src/classes/java/util/list.rs rename to rustjava-runtime/src/classes/java/util/list.rs index 672e607d..69f2600a 100644 --- a/java_runtime/src/classes/java/util/list.rs +++ b/rustjava-runtime/src/classes/java/util/list.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/util/list_iterator.rs b/rustjava-runtime/src/classes/java/util/list_iterator.rs similarity index 94% rename from java_runtime/src/classes/java/util/list_iterator.rs rename to rustjava-runtime/src/classes/java/util/list_iterator.rs index 9fce5731..464aeb6f 100644 --- a/java_runtime/src/classes/java/util/list_iterator.rs +++ b/rustjava-runtime/src/classes/java/util/list_iterator.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/util/locale.rs b/rustjava-runtime/src/classes/java/util/locale.rs similarity index 99% rename from java_runtime/src/classes/java/util/locale.rs rename to rustjava-runtime/src/classes/java/util/locale.rs index 770f602d..9a26500c 100644 --- a/java_runtime/src/classes/java/util/locale.rs +++ b/rustjava-runtime/src/classes/java/util/locale.rs @@ -2,9 +2,9 @@ use core::iter; use alloc::{format, string::ToString, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/logging.rs b/rustjava-runtime/src/classes/java/util/logging.rs similarity index 100% rename from java_runtime/src/classes/java/util/logging.rs rename to rustjava-runtime/src/classes/java/util/logging.rs diff --git a/java_runtime/src/classes/java/util/logging/console_handler.rs b/rustjava-runtime/src/classes/java/util/logging/console_handler.rs similarity index 96% rename from java_runtime/src/classes/java/util/logging/console_handler.rs rename to rustjava-runtime/src/classes/java/util/logging/console_handler.rs index 77af50a7..58ba55ae 100644 --- a/java_runtime/src/classes/java/util/logging/console_handler.rs +++ b/rustjava-runtime/src/classes/java/util/logging/console_handler.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::io::OutputStream}; diff --git a/java_runtime/src/classes/java/util/logging/filter.rs b/rustjava-runtime/src/classes/java/util/logging/filter.rs similarity index 87% rename from java_runtime/src/classes/java/util/logging/filter.rs rename to rustjava-runtime/src/classes/java/util/logging/filter.rs index f98baeea..d3b91e91 100644 --- a/java_runtime/src/classes/java/util/logging/filter.rs +++ b/rustjava-runtime/src/classes/java/util/logging/filter.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/util/logging/formatter.rs b/rustjava-runtime/src/classes/java/util/logging/formatter.rs similarity index 98% rename from java_runtime/src/classes/java/util/logging/formatter.rs rename to rustjava-runtime/src/classes/java/util/logging/formatter.rs index 42a9d810..97825314 100644 --- a/java_runtime/src/classes/java/util/logging/formatter.rs +++ b/rustjava-runtime/src/classes/java/util/logging/formatter.rs @@ -1,8 +1,8 @@ use alloc::{string::String as RustString, vec, vec::Vec}; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/logging/handler.rs b/rustjava-runtime/src/classes/java/util/logging/handler.rs similarity index 98% rename from java_runtime/src/classes/java/util/logging/handler.rs rename to rustjava-runtime/src/classes/java/util/logging/handler.rs index 643365fd..8b123dad 100644 --- a/java_runtime/src/classes/java/util/logging/handler.rs +++ b/rustjava-runtime/src/classes/java/util/logging/handler.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/logging/level.rs b/rustjava-runtime/src/classes/java/util/logging/level.rs similarity index 98% rename from java_runtime/src/classes/java/util/logging/level.rs rename to rustjava-runtime/src/classes/java/util/logging/level.rs index 7379652f..7b2aa225 100644 --- a/java_runtime/src/classes/java/util/logging/level.rs +++ b/rustjava-runtime/src/classes/java/util/logging/level.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/logging/log_manager.rs b/rustjava-runtime/src/classes/java/util/logging/log_manager.rs similarity index 99% rename from java_runtime/src/classes/java/util/logging/log_manager.rs rename to rustjava-runtime/src/classes/java/util/logging/log_manager.rs index c8f04313..ec72a99f 100644 --- a/java_runtime/src/classes/java/util/logging/log_manager.rs +++ b/rustjava-runtime/src/classes/java/util/logging/log_manager.rs @@ -1,8 +1,8 @@ use alloc::{string::String as RustString, vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/logging/log_record.rs b/rustjava-runtime/src/classes/java/util/logging/log_record.rs similarity index 99% rename from java_runtime/src/classes/java/util/logging/log_record.rs rename to rustjava-runtime/src/classes/java/util/logging/log_record.rs index 095cafac..e9ca8cae 100644 --- a/java_runtime/src/classes/java/util/logging/log_record.rs +++ b/rustjava-runtime/src/classes/java/util/logging/log_record.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/logging/logger.rs b/rustjava-runtime/src/classes/java/util/logging/logger.rs similarity index 99% rename from java_runtime/src/classes/java/util/logging/logger.rs rename to rustjava-runtime/src/classes/java/util/logging/logger.rs index 16d853b3..235ad64e 100644 --- a/java_runtime/src/classes/java/util/logging/logger.rs +++ b/rustjava-runtime/src/classes/java/util/logging/logger.rs @@ -1,8 +1,8 @@ use alloc::{vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/logging/simple_formatter.rs b/rustjava-runtime/src/classes/java/util/logging/simple_formatter.rs similarity index 98% rename from java_runtime/src/classes/java/util/logging/simple_formatter.rs rename to rustjava-runtime/src/classes/java/util/logging/simple_formatter.rs index 6ebc60e8..c7028e1d 100644 --- a/java_runtime/src/classes/java/util/logging/simple_formatter.rs +++ b/rustjava-runtime/src/classes/java/util/logging/simple_formatter.rs @@ -1,8 +1,8 @@ use alloc::{format, string::String as RustString, vec}; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/logging/stream_handler.rs b/rustjava-runtime/src/classes/java/util/logging/stream_handler.rs similarity index 99% rename from java_runtime/src/classes/java/util/logging/stream_handler.rs rename to rustjava-runtime/src/classes/java/util/logging/stream_handler.rs index e59c4af6..f5813591 100644 --- a/java_runtime/src/classes/java/util/logging/stream_handler.rs +++ b/rustjava-runtime/src/classes/java/util/logging/stream_handler.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, JavaError, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/map.rs b/rustjava-runtime/src/classes/java/util/map.rs similarity index 96% rename from java_runtime/src/classes/java/util/map.rs rename to rustjava-runtime/src/classes/java/util/map.rs index 73a6e34f..1356cb44 100644 --- a/java_runtime/src/classes/java/util/map.rs +++ b/rustjava-runtime/src/classes/java/util/map.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/util/map_entry.rs b/rustjava-runtime/src/classes/java/util/map_entry.rs similarity index 93% rename from java_runtime/src/classes/java/util/map_entry.rs rename to rustjava-runtime/src/classes/java/util/map_entry.rs index 30a2e27b..7c7f5b72 100644 --- a/java_runtime/src/classes/java/util/map_entry.rs +++ b/rustjava-runtime/src/classes/java/util/map_entry.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/util/missing_format_argument_exception.rs b/rustjava-runtime/src/classes/java/util/missing_format_argument_exception.rs similarity index 94% rename from java_runtime/src/classes/java/util/missing_format_argument_exception.rs rename to rustjava-runtime/src/classes/java/util/missing_format_argument_exception.rs index 34ef71fa..26439659 100644 --- a/java_runtime/src/classes/java/util/missing_format_argument_exception.rs +++ b/rustjava-runtime/src/classes/java/util/missing_format_argument_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/util/missing_format_width_exception.rs b/rustjava-runtime/src/classes/java/util/missing_format_width_exception.rs similarity index 93% rename from java_runtime/src/classes/java/util/missing_format_width_exception.rs rename to rustjava-runtime/src/classes/java/util/missing_format_width_exception.rs index 6deca47e..fb6c19d8 100644 --- a/java_runtime/src/classes/java/util/missing_format_width_exception.rs +++ b/rustjava-runtime/src/classes/java/util/missing_format_width_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/util/no_such_element_exception.rs b/rustjava-runtime/src/classes/java/util/no_such_element_exception.rs similarity index 94% rename from java_runtime/src/classes/java/util/no_such_element_exception.rs rename to rustjava-runtime/src/classes/java/util/no_such_element_exception.rs index 78ca4d59..fa1ade3f 100644 --- a/java_runtime/src/classes/java/util/no_such_element_exception.rs +++ b/rustjava-runtime/src/classes/java/util/no_such_element_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/util/properties.rs b/rustjava-runtime/src/classes/java/util/properties.rs similarity index 99% rename from java_runtime/src/classes/java/util/properties.rs rename to rustjava-runtime/src/classes/java/util/properties.rs index 68f4da37..bdf00f7d 100644 --- a/java_runtime/src/classes/java/util/properties.rs +++ b/rustjava-runtime/src/classes/java/util/properties.rs @@ -1,8 +1,8 @@ use alloc::{format, string::String as RustString, vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, JavaChar, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/random.rs b/rustjava-runtime/src/classes/java/util/random.rs similarity index 98% rename from java_runtime/src/classes/java/util/random.rs rename to rustjava-runtime/src/classes/java/util/random.rs index 76431426..46a99a41 100644 --- a/java_runtime/src/classes/java/util/random.rs +++ b/rustjava-runtime/src/classes/java/util/random.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext}; diff --git a/java_runtime/src/classes/java/util/regex.rs b/rustjava-runtime/src/classes/java/util/regex.rs similarity index 100% rename from java_runtime/src/classes/java/util/regex.rs rename to rustjava-runtime/src/classes/java/util/regex.rs diff --git a/java_runtime/src/classes/java/util/regex/matcher.rs b/rustjava-runtime/src/classes/java/util/regex/matcher.rs similarity index 99% rename from java_runtime/src/classes/java/util/regex/matcher.rs rename to rustjava-runtime/src/classes/java/util/regex/matcher.rs index afaed226..c39df2b0 100644 --- a/java_runtime/src/classes/java/util/regex/matcher.rs +++ b/rustjava-runtime/src/classes/java/util/regex/matcher.rs @@ -1,8 +1,8 @@ use alloc::{string::String as RustString, vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/regex/pattern.rs b/rustjava-runtime/src/classes/java/util/regex/pattern.rs similarity index 99% rename from java_runtime/src/classes/java/util/regex/pattern.rs rename to rustjava-runtime/src/classes/java/util/regex/pattern.rs index c81aae71..c489600c 100644 --- a/java_runtime/src/classes/java/util/regex/pattern.rs +++ b/rustjava-runtime/src/classes/java/util/regex/pattern.rs @@ -1,8 +1,8 @@ use alloc::{format, string::ToString, vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaError, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use regex::{Regex, RegexBuilder}; use crate::{ diff --git a/java_runtime/src/classes/java/util/regex/pattern_syntax_exception.rs b/rustjava-runtime/src/classes/java/util/regex/pattern_syntax_exception.rs similarity index 98% rename from java_runtime/src/classes/java/util/regex/pattern_syntax_exception.rs rename to rustjava-runtime/src/classes/java/util/regex/pattern_syntax_exception.rs index d337eeb9..780db02d 100644 --- a/java_runtime/src/classes/java/util/regex/pattern_syntax_exception.rs +++ b/rustjava-runtime/src/classes/java/util/regex/pattern_syntax_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, JavaChar, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/set.rs b/rustjava-runtime/src/classes/java/util/set.rs similarity index 97% rename from java_runtime/src/classes/java/util/set.rs rename to rustjava-runtime/src/classes/java/util/set.rs index 3796255c..f07a38e9 100644 --- a/java_runtime/src/classes/java/util/set.rs +++ b/rustjava-runtime/src/classes/java/util/set.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/util/simple_time_zone.rs b/rustjava-runtime/src/classes/java/util/simple_time_zone.rs similarity index 96% rename from java_runtime/src/classes/java/util/simple_time_zone.rs rename to rustjava-runtime/src/classes/java/util/simple_time_zone.rs index 188913a2..32759a1c 100644 --- a/java_runtime/src/classes/java/util/simple_time_zone.rs +++ b/rustjava-runtime/src/classes/java/util/simple_time_zone.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/sorted_map.rs b/rustjava-runtime/src/classes/java/util/sorted_map.rs similarity index 94% rename from java_runtime/src/classes/java/util/sorted_map.rs rename to rustjava-runtime/src/classes/java/util/sorted_map.rs index 9eaef561..842959e1 100644 --- a/java_runtime/src/classes/java/util/sorted_map.rs +++ b/rustjava-runtime/src/classes/java/util/sorted_map.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/util/sorted_set.rs b/rustjava-runtime/src/classes/java/util/sorted_set.rs similarity index 94% rename from java_runtime/src/classes/java/util/sorted_set.rs rename to rustjava-runtime/src/classes/java/util/sorted_set.rs index 8e335365..c2fdf5f8 100644 --- a/java_runtime/src/classes/java/util/sorted_set.rs +++ b/rustjava-runtime/src/classes/java/util/sorted_set.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::RuntimeClassProto; diff --git a/java_runtime/src/classes/java/util/stack.rs b/rustjava-runtime/src/classes/java/util/stack.rs similarity index 97% rename from java_runtime/src/classes/java/util/stack.rs rename to rustjava-runtime/src/classes/java/util/stack.rs index 457031e5..974e3619 100644 --- a/java_runtime/src/classes/java/util/stack.rs +++ b/rustjava-runtime/src/classes/java/util/stack.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/string_tokenizer.rs b/rustjava-runtime/src/classes/java/util/string_tokenizer.rs similarity index 98% rename from java_runtime/src/classes/java/util/string_tokenizer.rs rename to rustjava-runtime/src/classes/java/util/string_tokenizer.rs index 94cdfc91..0308d55b 100644 --- a/java_runtime/src/classes/java/util/string_tokenizer.rs +++ b/rustjava-runtime/src/classes/java/util/string_tokenizer.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/time_zone.rs b/rustjava-runtime/src/classes/java/util/time_zone.rs similarity index 98% rename from java_runtime/src/classes/java/util/time_zone.rs rename to rustjava-runtime/src/classes/java/util/time_zone.rs index 94080f76..91daa5d7 100644 --- a/java_runtime/src/classes/java/util/time_zone.rs +++ b/rustjava-runtime/src/classes/java/util/time_zone.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/timer.rs b/rustjava-runtime/src/classes/java/util/timer.rs similarity index 98% rename from java_runtime/src/classes/java/util/timer.rs rename to rustjava-runtime/src/classes/java/util/timer.rs index f44876f2..d1efe35c 100644 --- a/java_runtime/src/classes/java/util/timer.rs +++ b/rustjava-runtime/src/classes/java/util/timer.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/timer_task.rs b/rustjava-runtime/src/classes/java/util/timer_task.rs similarity index 96% rename from java_runtime/src/classes/java/util/timer_task.rs rename to rustjava-runtime/src/classes/java/util/timer_task.rs index 45fc3659..bcf1c844 100644 --- a/java_runtime/src/classes/java/util/timer_task.rs +++ b/rustjava-runtime/src/classes/java/util/timer_task.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/timer_task_queue.rs b/rustjava-runtime/src/classes/java/util/timer_task_queue.rs similarity index 98% rename from java_runtime/src/classes/java/util/timer_task_queue.rs rename to rustjava-runtime/src/classes/java/util/timer_task_queue.rs index 1e7520a5..a4fcd7fd 100644 --- a/java_runtime/src/classes/java/util/timer_task_queue.rs +++ b/rustjava-runtime/src/classes/java/util/timer_task_queue.rs @@ -1,8 +1,8 @@ use alloc::{vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::util::TimerTask}; diff --git a/java_runtime/src/classes/java/util/timer_thread.rs b/rustjava-runtime/src/classes/java/util/timer_thread.rs similarity index 98% rename from java_runtime/src/classes/java/util/timer_thread.rs rename to rustjava-runtime/src/classes/java/util/timer_thread.rs index 3df816cb..20cb134e 100644 --- a/java_runtime/src/classes/java/util/timer_thread.rs +++ b/rustjava-runtime/src/classes/java/util/timer_thread.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, JavaError, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/tree_map.rs b/rustjava-runtime/src/classes/java/util/tree_map.rs similarity index 99% rename from java_runtime/src/classes/java/util/tree_map.rs rename to rustjava-runtime/src/classes/java/util/tree_map.rs index 154d7a44..ac5f4f0d 100644 --- a/java_runtime/src/classes/java/util/tree_map.rs +++ b/rustjava-runtime/src/classes/java/util/tree_map.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/tree_map_entry.rs b/rustjava-runtime/src/classes/java/util/tree_map_entry.rs similarity index 97% rename from java_runtime/src/classes/java/util/tree_map_entry.rs rename to rustjava-runtime/src/classes/java/util/tree_map_entry.rs index 1b533f12..0b70fb7c 100644 --- a/java_runtime/src/classes/java/util/tree_map_entry.rs +++ b/rustjava-runtime/src/classes/java/util/tree_map_entry.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/tree_map_entry_iterator.rs b/rustjava-runtime/src/classes/java/util/tree_map_entry_iterator.rs similarity index 94% rename from java_runtime/src/classes/java/util/tree_map_entry_iterator.rs rename to rustjava-runtime/src/classes/java/util/tree_map_entry_iterator.rs index 7efde8d6..191affad 100644 --- a/java_runtime/src/classes/java/util/tree_map_entry_iterator.rs +++ b/rustjava-runtime/src/classes/java/util/tree_map_entry_iterator.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/tree_map_entry_set.rs b/rustjava-runtime/src/classes/java/util/tree_map_entry_set.rs similarity index 97% rename from java_runtime/src/classes/java/util/tree_map_entry_set.rs rename to rustjava-runtime/src/classes/java/util/tree_map_entry_set.rs index dec1189a..5d32bc74 100644 --- a/java_runtime/src/classes/java/util/tree_map_entry_set.rs +++ b/rustjava-runtime/src/classes/java/util/tree_map_entry_set.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/tree_map_key_iterator.rs b/rustjava-runtime/src/classes/java/util/tree_map_key_iterator.rs similarity index 95% rename from java_runtime/src/classes/java/util/tree_map_key_iterator.rs rename to rustjava-runtime/src/classes/java/util/tree_map_key_iterator.rs index d6c25111..b0fc8122 100644 --- a/java_runtime/src/classes/java/util/tree_map_key_iterator.rs +++ b/rustjava-runtime/src/classes/java/util/tree_map_key_iterator.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/tree_map_key_set.rs b/rustjava-runtime/src/classes/java/util/tree_map_key_set.rs similarity index 96% rename from java_runtime/src/classes/java/util/tree_map_key_set.rs rename to rustjava-runtime/src/classes/java/util/tree_map_key_set.rs index e61ab24e..351622f8 100644 --- a/java_runtime/src/classes/java/util/tree_map_key_set.rs +++ b/rustjava-runtime/src/classes/java/util/tree_map_key_set.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/tree_map_private_entry_iterator.rs b/rustjava-runtime/src/classes/java/util/tree_map_private_entry_iterator.rs similarity index 97% rename from java_runtime/src/classes/java/util/tree_map_private_entry_iterator.rs rename to rustjava-runtime/src/classes/java/util/tree_map_private_entry_iterator.rs index 68c91cd1..7951af4f 100644 --- a/java_runtime/src/classes/java/util/tree_map_private_entry_iterator.rs +++ b/rustjava-runtime/src/classes/java/util/tree_map_private_entry_iterator.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/tree_map_sub_map.rs b/rustjava-runtime/src/classes/java/util/tree_map_sub_map.rs similarity index 99% rename from java_runtime/src/classes/java/util/tree_map_sub_map.rs rename to rustjava-runtime/src/classes/java/util/tree_map_sub_map.rs index cced84ed..128f91fe 100644 --- a/java_runtime/src/classes/java/util/tree_map_sub_map.rs +++ b/rustjava-runtime/src/classes/java/util/tree_map_sub_map.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/tree_map_value_iterator.rs b/rustjava-runtime/src/classes/java/util/tree_map_value_iterator.rs similarity index 95% rename from java_runtime/src/classes/java/util/tree_map_value_iterator.rs rename to rustjava-runtime/src/classes/java/util/tree_map_value_iterator.rs index b86e39a7..071cea05 100644 --- a/java_runtime/src/classes/java/util/tree_map_value_iterator.rs +++ b/rustjava-runtime/src/classes/java/util/tree_map_value_iterator.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/tree_map_values.rs b/rustjava-runtime/src/classes/java/util/tree_map_values.rs similarity index 96% rename from java_runtime/src/classes/java/util/tree_map_values.rs rename to rustjava-runtime/src/classes/java/util/tree_map_values.rs index ba5b816f..7c10b05b 100644 --- a/java_runtime/src/classes/java/util/tree_map_values.rs +++ b/rustjava-runtime/src/classes/java/util/tree_map_values.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/tree_set.rs b/rustjava-runtime/src/classes/java/util/tree_set.rs similarity index 98% rename from java_runtime/src/classes/java/util/tree_set.rs rename to rustjava-runtime/src/classes/java/util/tree_set.rs index 4ebc22d8..2a65a390 100644 --- a/java_runtime/src/classes/java/util/tree_set.rs +++ b/rustjava-runtime/src/classes/java/util/tree_set.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/unknown_format_conversion_exception.rs b/rustjava-runtime/src/classes/java/util/unknown_format_conversion_exception.rs similarity index 94% rename from java_runtime/src/classes/java/util/unknown_format_conversion_exception.rs rename to rustjava-runtime/src/classes/java/util/unknown_format_conversion_exception.rs index 353f85a2..09841d4c 100644 --- a/java_runtime/src/classes/java/util/unknown_format_conversion_exception.rs +++ b/rustjava-runtime/src/classes/java/util/unknown_format_conversion_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/util/unknown_format_flags_exception.rs b/rustjava-runtime/src/classes/java/util/unknown_format_flags_exception.rs similarity index 94% rename from java_runtime/src/classes/java/util/unknown_format_flags_exception.rs rename to rustjava-runtime/src/classes/java/util/unknown_format_flags_exception.rs index 4c6037b6..e3e6d6ca 100644 --- a/java_runtime/src/classes/java/util/unknown_format_flags_exception.rs +++ b/rustjava-runtime/src/classes/java/util/unknown_format_flags_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/util/vector.rs b/rustjava-runtime/src/classes/java/util/vector.rs similarity index 99% rename from java_runtime/src/classes/java/util/vector.rs rename to rustjava-runtime/src/classes/java/util/vector.rs index fcf8c764..17476e2d 100644 --- a/java_runtime/src/classes/java/util/vector.rs +++ b/rustjava-runtime/src/classes/java/util/vector.rs @@ -5,9 +5,9 @@ use alloc::{ vec::Vec, }; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/vector_itr.rs b/rustjava-runtime/src/classes/java/util/vector_itr.rs similarity index 98% rename from java_runtime/src/classes/java/util/vector_itr.rs rename to rustjava-runtime/src/classes/java/util/vector_itr.rs index 358d9663..169ddc84 100644 --- a/java_runtime/src/classes/java/util/vector_itr.rs +++ b/rustjava-runtime/src/classes/java/util/vector_itr.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; diff --git a/java_runtime/src/classes/java/util/zip.rs b/rustjava-runtime/src/classes/java/util/zip.rs similarity index 100% rename from java_runtime/src/classes/java/util/zip.rs rename to rustjava-runtime/src/classes/java/util/zip.rs diff --git a/java_runtime/src/classes/java/util/zip/zip_entry.rs b/rustjava-runtime/src/classes/java/util/zip/zip_entry.rs similarity index 96% rename from java_runtime/src/classes/java/util/zip/zip_entry.rs rename to rustjava-runtime/src/classes/java/util/zip/zip_entry.rs index 28bfb074..2a06d4eb 100644 --- a/java_runtime/src/classes/java/util/zip/zip_entry.rs +++ b/rustjava-runtime/src/classes/java/util/zip/zip_entry.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/util/zip/zip_exception.rs b/rustjava-runtime/src/classes/java/util/zip/zip_exception.rs similarity index 93% rename from java_runtime/src/classes/java/util/zip/zip_exception.rs rename to rustjava-runtime/src/classes/java/util/zip/zip_exception.rs index a1dbb3fd..2c2225e5 100644 --- a/java_runtime/src/classes/java/util/zip/zip_exception.rs +++ b/rustjava-runtime/src/classes/java/util/zip/zip_exception.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String}; diff --git a/java_runtime/src/classes/java/util/zip/zip_file.rs b/rustjava-runtime/src/classes/java/util/zip/zip_file.rs similarity index 97% rename from java_runtime/src/classes/java/util/zip/zip_file.rs rename to rustjava-runtime/src/classes/java/util/zip/zip_file.rs index cecfa862..c1baad02 100644 --- a/java_runtime/src/classes/java/util/zip/zip_file.rs +++ b/rustjava-runtime/src/classes/java/util/zip/zip_file.rs @@ -7,9 +7,9 @@ use std::io::{Cursor, Read}; use zip::ZipArchive; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/java/util/zip/zip_file_entries.rs b/rustjava-runtime/src/classes/java/util/zip/zip_file_entries.rs similarity index 96% rename from java_runtime/src/classes/java/util/zip/zip_file_entries.rs rename to rustjava-runtime/src/classes/java/util/zip/zip_file_entries.rs index cfefdc06..37fd754d 100644 --- a/java_runtime/src/classes/java/util/zip/zip_file_entries.rs +++ b/rustjava-runtime/src/classes/java/util/zip/zip_file_entries.rs @@ -1,8 +1,8 @@ use alloc::{vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/org.rs b/rustjava-runtime/src/classes/org.rs similarity index 100% rename from java_runtime/src/classes/org.rs rename to rustjava-runtime/src/classes/org.rs diff --git a/java_runtime/src/classes/org/rustjava.rs b/rustjava-runtime/src/classes/org/rustjava.rs similarity index 100% rename from java_runtime/src/classes/org/rustjava.rs rename to rustjava-runtime/src/classes/org/rustjava.rs diff --git a/java_runtime/src/classes/org/rustjava/lang.rs b/rustjava-runtime/src/classes/org/rustjava/lang.rs similarity index 100% rename from java_runtime/src/classes/org/rustjava/lang.rs rename to rustjava-runtime/src/classes/org/rustjava/lang.rs diff --git a/java_runtime/src/classes/org/rustjava/lang/rust_jar_class_loader.rs b/rustjava-runtime/src/classes/org/rustjava/lang/rust_jar_class_loader.rs similarity index 95% rename from java_runtime/src/classes/org/rustjava/lang/rust_jar_class_loader.rs rename to rustjava-runtime/src/classes/org/rustjava/lang/rust_jar_class_loader.rs index 005f4160..3039326f 100644 --- a/java_runtime/src/classes/org/rustjava/lang/rust_jar_class_loader.rs +++ b/rustjava-runtime/src/classes/org/rustjava/lang/rust_jar_class_loader.rs @@ -1,8 +1,8 @@ use alloc::{vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{Array, ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/org/rustjava/net.rs b/rustjava-runtime/src/classes/org/rustjava/net.rs similarity index 100% rename from java_runtime/src/classes/org/rustjava/net.rs rename to rustjava-runtime/src/classes/org/rustjava/net.rs diff --git a/java_runtime/src/classes/org/rustjava/net/file_url_connection.rs b/rustjava-runtime/src/classes/org/rustjava/net/file_url_connection.rs similarity index 94% rename from java_runtime/src/classes/org/rustjava/net/file_url_connection.rs rename to rustjava-runtime/src/classes/org/rustjava/net/file_url_connection.rs index 4ad92d28..028670f8 100644 --- a/java_runtime/src/classes/org/rustjava/net/file_url_connection.rs +++ b/rustjava-runtime/src/classes/org/rustjava/net/file_url_connection.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/org/rustjava/net/file_url_handler.rs b/rustjava-runtime/src/classes/org/rustjava/net/file_url_handler.rs similarity index 95% rename from java_runtime/src/classes/org/rustjava/net/file_url_handler.rs rename to rustjava-runtime/src/classes/org/rustjava/net/file_url_handler.rs index 90712e88..16fadd22 100644 --- a/java_runtime/src/classes/org/rustjava/net/file_url_handler.rs +++ b/rustjava-runtime/src/classes/org/rustjava/net/file_url_handler.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/org/rustjava/net/jar_url_connection.rs b/rustjava-runtime/src/classes/org/rustjava/net/jar_url_connection.rs similarity index 97% rename from java_runtime/src/classes/org/rustjava/net/jar_url_connection.rs rename to rustjava-runtime/src/classes/org/rustjava/net/jar_url_connection.rs index 75280717..a72ce06e 100644 --- a/java_runtime/src/classes/org/rustjava/net/jar_url_connection.rs +++ b/rustjava-runtime/src/classes/org/rustjava/net/jar_url_connection.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/classes/org/rustjava/net/jar_url_handler.rs b/rustjava-runtime/src/classes/org/rustjava/net/jar_url_handler.rs similarity index 94% rename from java_runtime/src/classes/org/rustjava/net/jar_url_handler.rs rename to rustjava-runtime/src/classes/org/rustjava/net/jar_url_handler.rs index 5d405199..52679746 100644 --- a/java_runtime/src/classes/org/rustjava/net/jar_url_handler.rs +++ b/rustjava-runtime/src/classes/org/rustjava/net/jar_url_handler.rs @@ -1,8 +1,8 @@ use alloc::vec; -use java_class_proto::JavaMethodProto; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; use jvm::{ClassInstanceRef, Jvm, Result}; +use jvm_class_proto::JavaMethodProto; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; use crate::{ RuntimeClassProto, RuntimeContext, diff --git a/java_runtime/src/lib.rs b/rustjava-runtime/src/lib.rs similarity index 82% rename from java_runtime/src/lib.rs rename to rustjava-runtime/src/lib.rs index 2eaba5bc..f3a3312d 100644 --- a/java_runtime/src/lib.rs +++ b/rustjava-runtime/src/lib.rs @@ -12,6 +12,6 @@ pub use self::{ }; pub type RuntimeContext = dyn runtime::Runtime; -pub type RuntimeClassProto = java_class_proto::JavaClassProto; +pub type RuntimeClassProto = jvm_class_proto::JavaClassProto; pub static RT_RUSTJAR: &str = "rt.rustjar"; diff --git a/java_runtime/src/loader.rs b/rustjava-runtime/src/loader.rs similarity index 100% rename from java_runtime/src/loader.rs rename to rustjava-runtime/src/loader.rs diff --git a/java_runtime/src/runtime.rs b/rustjava-runtime/src/runtime.rs similarity index 100% rename from java_runtime/src/runtime.rs rename to rustjava-runtime/src/runtime.rs diff --git a/java_runtime/src/runtime/io.rs b/rustjava-runtime/src/runtime/io.rs similarity index 100% rename from java_runtime/src/runtime/io.rs rename to rustjava-runtime/src/runtime/io.rs diff --git a/java_runtime/tests/classes/java/io/mod.rs b/rustjava-runtime/tests/classes/java/io/mod.rs similarity index 100% rename from java_runtime/tests/classes/java/io/mod.rs rename to rustjava-runtime/tests/classes/java/io/mod.rs diff --git a/java_runtime/tests/classes/java/io/test_buffered_reader.rs b/rustjava-runtime/tests/classes/java/io/test_buffered_reader.rs similarity index 99% rename from java_runtime/tests/classes/java/io/test_buffered_reader.rs rename to rustjava-runtime/tests/classes/java/io/test_buffered_reader.rs index 01924cde..440a39ba 100644 --- a/java_runtime/tests/classes/java/io/test_buffered_reader.rs +++ b/rustjava-runtime/tests/classes/java/io/test_buffered_reader.rs @@ -1,17 +1,17 @@ use alloc::{boxed::Box, collections::BTreeMap, vec, vec::Vec}; use core::time::Duration; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::{ +use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, Jvm, Result, runtime::JavaLangString}; +use jvm_bytecode::ClassDefinitionImpl; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{ RuntimeClassProto, RuntimeContext, classes::java::{ io::{BufferedReader, Reader}, lang::String, }, }; -use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, Jvm, Result, runtime::JavaLangString}; -use jvm_rust::ClassDefinitionImpl; use test_utils::{TestRuntime, create_test_jvm}; diff --git a/java_runtime/tests/classes/java/io/test_buffered_streams.rs b/rustjava-runtime/tests/classes/java/io/test_buffered_streams.rs similarity index 97% rename from java_runtime/tests/classes/java/io/test_buffered_streams.rs rename to rustjava-runtime/tests/classes/java/io/test_buffered_streams.rs index a7da306b..23aca3bd 100644 --- a/java_runtime/tests/classes/java/io/test_buffered_streams.rs +++ b/rustjava-runtime/tests/classes/java/io/test_buffered_streams.rs @@ -1,9 +1,9 @@ -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::get_runtime_class_proto; use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, Result, runtime::JavaLangString}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::get_runtime_class_proto; -use java_runtime::classes::java::io::{InputStream, OutputStream, Writer}; -use java_runtime::classes::java::lang::Object; +use rustjava_runtime::classes::java::io::{InputStream, OutputStream, Writer}; +use rustjava_runtime::classes::java::lang::Object; use test_utils::test_jvm; #[tokio::test] @@ -353,7 +353,7 @@ async fn bio_06_bio_07_buffered_writer_contract() -> Result<()> { let _: () = jvm .invoke_virtual(&default_writer, &default_writer.class_definition().name(), "flush", "()V", ()) .await?; - let actual: ClassInstanceRef = jvm + let actual: ClassInstanceRef = jvm .invoke_virtual( &default_output, &default_output.class_definition().name(), @@ -387,7 +387,7 @@ async fn bio_06_bio_07_buffered_writer_contract() -> Result<()> { let _: () = jvm .invoke_virtual(&writer, &writer.class_definition().name(), "write", "([CII)V", (chars.clone(), 1, 2)) .await?; - let value: ClassInstanceRef = jvm + let value: ClassInstanceRef = jvm .invoke_virtual(&output, &output.class_definition().name(), "toString", "()Ljava/lang/String;", ()) .await?; assert_eq!(JavaLangString::to_rust_string(&jvm, &value).await?, ""); @@ -415,7 +415,7 @@ async fn bio_06_bio_07_buffered_writer_contract() -> Result<()> { assert!(jvm.is_instance(&*exception, "java/lang/IndexOutOfBoundsException")); let _: () = jvm.invoke_virtual(&writer, &writer.class_definition().name(), "flush", "()V", ()).await?; - let actual: ClassInstanceRef = jvm + let actual: ClassInstanceRef = jvm .invoke_virtual(&output, &output.class_definition().name(), "toString", "()Ljava/lang/String;", ()) .await?; assert_eq!(JavaLangString::to_rust_string(&jvm, &actual).await?, "ABCyZ!|"); @@ -425,7 +425,7 @@ async fn bio_06_bio_07_buffered_writer_contract() -> Result<()> { .await?; let _: () = jvm.invoke_virtual(&writer, &writer.class_definition().name(), "close", "()V", ()).await?; let _: () = jvm.invoke_virtual(&writer, &writer.class_definition().name(), "close", "()V", ()).await?; - let actual: ClassInstanceRef = jvm + let actual: ClassInstanceRef = jvm .invoke_virtual(&output, &output.class_definition().name(), "toString", "()Ljava/lang/String;", ()) .await?; assert_eq!(JavaLangString::to_rust_string(&jvm, &actual).await?, "ABCyZ!|Q"); @@ -450,7 +450,7 @@ async fn bio_06_bio_07_buffered_writer_contract() -> Result<()> { panic!("closed writer must reject a null array with IOException before validating arguments"); }; assert!(jvm.is_instance(&*exception, "java/io/IOException")); - let null_string: ClassInstanceRef = None.into(); + let null_string: ClassInstanceRef = None.into(); let closed: Result<()> = jvm .invoke_virtual( &writer, @@ -478,7 +478,7 @@ async fn bio_06_bio_07_buffered_writer_contract() -> Result<()> { let _: () = jvm .invoke_virtual(&writer, &writer.class_definition().name(), "write", "([CII)V", (chars, 0, 3)) .await?; - let actual: ClassInstanceRef = jvm + let actual: ClassInstanceRef = jvm .invoke_virtual(&output, &output.class_definition().name(), "toString", "()Ljava/lang/String;", ()) .await?; assert_eq!( diff --git a/java_runtime/tests/classes/java/io/test_byte_array_input_stream.rs b/rustjava-runtime/tests/classes/java/io/test_byte_array_input_stream.rs similarity index 100% rename from java_runtime/tests/classes/java/io/test_byte_array_input_stream.rs rename to rustjava-runtime/tests/classes/java/io/test_byte_array_input_stream.rs diff --git a/java_runtime/tests/classes/java/io/test_byte_array_output_stream.rs b/rustjava-runtime/tests/classes/java/io/test_byte_array_output_stream.rs similarity index 94% rename from java_runtime/tests/classes/java/io/test_byte_array_output_stream.rs rename to rustjava-runtime/tests/classes/java/io/test_byte_array_output_stream.rs index 66f86e0d..344aa40e 100644 --- a/java_runtime/tests/classes/java/io/test_byte_array_output_stream.rs +++ b/rustjava-runtime/tests/classes/java/io/test_byte_array_output_stream.rs @@ -2,9 +2,9 @@ use alloc::{vec, vec::Vec}; use bytemuck::cast_vec; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::classes::java::io::{ByteArrayOutputStream, OutputStream}; use jvm::{Array, ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::classes::java::io::{ByteArrayOutputStream, OutputStream}; use test_utils::test_jvm; @@ -168,9 +168,9 @@ async fn baos_01_rejects_null_and_unknown_encoding() -> Result<()> { }; assert!(jvm.is_instance(&*exception, "java/lang/NullPointerException")); - let null_encoding: ClassInstanceRef = None.into(); + let null_encoding: ClassInstanceRef = None.into(); let result = jvm - .invoke_virtual::<_, ClassInstanceRef>( + .invoke_virtual::<_, ClassInstanceRef>( &stream, &stream.class_definition().name(), "toString", @@ -185,7 +185,7 @@ async fn baos_01_rejects_null_and_unknown_encoding() -> Result<()> { let unknown = JavaLangString::from_rust_string(&jvm, "not-an-encoding").await?; let result = jvm - .invoke_virtual::<_, ClassInstanceRef>( + .invoke_virtual::<_, ClassInstanceRef>( &stream, &stream.class_definition().name(), "toString", diff --git a/java_runtime/tests/classes/java/io/test_char_streams.rs b/rustjava-runtime/tests/classes/java/io/test_char_streams.rs similarity index 99% rename from java_runtime/tests/classes/java/io/test_char_streams.rs rename to rustjava-runtime/tests/classes/java/io/test_char_streams.rs index f57e0373..618affde 100644 --- a/java_runtime/tests/classes/java/io/test_char_streams.rs +++ b/rustjava-runtime/tests/classes/java/io/test_char_streams.rs @@ -1,6 +1,6 @@ use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, Result, runtime::JavaLangString}; -use java_runtime::classes::java::lang::String; +use rustjava_runtime::classes::java::lang::String; use test_utils::test_jvm; #[tokio::test] diff --git a/java_runtime/tests/classes/java/io/test_data_input_stream.rs b/rustjava-runtime/tests/classes/java/io/test_data_input_stream.rs similarity index 99% rename from java_runtime/tests/classes/java/io/test_data_input_stream.rs rename to rustjava-runtime/tests/classes/java/io/test_data_input_stream.rs index 3135dda0..9f4aa8bd 100644 --- a/java_runtime/tests/classes/java/io/test_data_input_stream.rs +++ b/rustjava-runtime/tests/classes/java/io/test_data_input_stream.rs @@ -2,8 +2,8 @@ use alloc::vec; use bytemuck::cast_vec; -use java_runtime::classes::java::lang::String; use jvm::{ClassInstanceRef, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::lang::String; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/io/test_data_output_stream.rs b/rustjava-runtime/tests/classes/java/io/test_data_output_stream.rs similarity index 98% rename from java_runtime/tests/classes/java/io/test_data_output_stream.rs rename to rustjava-runtime/tests/classes/java/io/test_data_output_stream.rs index 08e63567..d84abbe1 100644 --- a/java_runtime/tests/classes/java/io/test_data_output_stream.rs +++ b/rustjava-runtime/tests/classes/java/io/test_data_output_stream.rs @@ -233,7 +233,7 @@ async fn test_data_stream_modified_utf_round_trip_and_malformed_input() -> Resul let input = jvm.new_class("java/io/ByteArrayInputStream", "([B)V", (bytes,)).await?; let data_input = jvm.new_class("java/io/DataInputStream", "(Ljava/io/InputStream;)V", (input,)).await?; - let decoded: ClassInstanceRef = jvm + let decoded: ClassInstanceRef = jvm .invoke_virtual(&data_input, &data_input.class_definition().name(), "readUTF", "()Ljava/lang/String;", ()) .await?; assert_eq!(JavaLangString::to_rust_string(&jvm, &decoded).await?, "\0A😀한"); @@ -242,7 +242,7 @@ async fn test_data_stream_modified_utf_round_trip_and_malformed_input() -> Resul jvm.store_array(&mut malformed, 0, [0i8, 2, -62, 32]).await?; let input = jvm.new_class("java/io/ByteArrayInputStream", "([B)V", (malformed,)).await?; let data_input = jvm.new_class("java/io/DataInputStream", "(Ljava/io/InputStream;)V", (input,)).await?; - let result: Result> = jvm + let result: Result> = jvm .invoke_virtual(&data_input, &data_input.class_definition().name(), "readUTF", "()Ljava/lang/String;", ()) .await; let Err(JavaError::JavaException(exception)) = result else { diff --git a/java_runtime/tests/classes/java/io/test_file.rs b/rustjava-runtime/tests/classes/java/io/test_file.rs similarity index 96% rename from java_runtime/tests/classes/java/io/test_file.rs rename to rustjava-runtime/tests/classes/java/io/test_file.rs index 014fade0..e5562565 100644 --- a/java_runtime/tests/classes/java/io/test_file.rs +++ b/rustjava-runtime/tests/classes/java/io/test_file.rs @@ -1,5 +1,5 @@ -use java_runtime::classes::java::lang::String; use jvm::{ClassInstanceRef, JavaChar, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::lang::String; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/io/test_file_input_stream.rs b/rustjava-runtime/tests/classes/java/io/test_file_input_stream.rs similarity index 100% rename from java_runtime/tests/classes/java/io/test_file_input_stream.rs rename to rustjava-runtime/tests/classes/java/io/test_file_input_stream.rs diff --git a/java_runtime/tests/classes/java/io/test_file_reader_writer.rs b/rustjava-runtime/tests/classes/java/io/test_file_reader_writer.rs similarity index 98% rename from java_runtime/tests/classes/java/io/test_file_reader_writer.rs rename to rustjava-runtime/tests/classes/java/io/test_file_reader_writer.rs index d86816fd..71b66725 100644 --- a/java_runtime/tests/classes/java/io/test_file_reader_writer.rs +++ b/rustjava-runtime/tests/classes/java/io/test_file_reader_writer.rs @@ -5,12 +5,12 @@ use core::{ }; use std::sync::Mutex; -use java_runtime::{ +use jvm::{Array, ClassDefinition, ClassInstanceRef, JavaError, Jvm, Result, runtime::JavaLangString}; +use jvm_bytecode::ClassDefinitionImpl; +use rustjava_runtime::{ File as RuntimeFile, FileDescriptorId, FileOpenOptions, FileSize, FileStat, FileType, IOError, IOResult, RT_RUSTJAR, Runtime, SpawnCallback, classes::java::lang::Object, get_runtime_class_proto, }; -use jvm::{Array, ClassDefinition, ClassInstanceRef, JavaError, Jvm, Result, runtime::JavaLangString}; -use jvm_rust::ClassDefinitionImpl; use test_utils::{TestRuntime, create_test_jvm, test_jvm_filesystem}; type MemoryFiles = Arc>>>>>; @@ -307,7 +307,7 @@ async fn file_01_file_reader_constructor_contracts() -> Result<()> { ); let input = jvm.new_class("java/io/FileInputStream", "(Ljava/io/File;)V", (file,)).await?; - let descriptor: ClassInstanceRef = + let descriptor: ClassInstanceRef = jvm.get_field(&input, "fd", "Ljava/io/FileDescriptor;").await?; let reader = jvm.new_class("java/io/FileReader", "(Ljava/io/FileDescriptor;)V", (descriptor,)).await?; assert_eq!( @@ -316,7 +316,7 @@ async fn file_01_file_reader_constructor_contracts() -> Result<()> { 'A' as i32 ); - let null_path: ClassInstanceRef = None.into(); + let null_path: ClassInstanceRef = None.into(); let result = jvm.new_class("java/io/FileReader", "(Ljava/lang/String;)V", (null_path,)).await; let Err(JavaError::JavaException(exception)) = result else { panic!("null path must throw NullPointerException"); @@ -395,7 +395,7 @@ async fn file_02_file_03_file_writer_constructor_and_append_contracts() -> Resul assert_eq!(&*runtime.files.lock().unwrap()["output.txt"].lock().unwrap(), b"reset"); let output = jvm.new_class("java/io/FileOutputStream", "(Ljava/io/File;)V", (file,)).await?; - let descriptor: ClassInstanceRef = + let descriptor: ClassInstanceRef = jvm.get_field(&output, "fd", "Ljava/io/FileDescriptor;").await?; let writer = jvm.new_class("java/io/FileWriter", "(Ljava/io/FileDescriptor;)V", (descriptor,)).await?; let value = JavaLangString::from_rust_string(&jvm, "F").await?; @@ -405,7 +405,7 @@ async fn file_02_file_03_file_writer_constructor_and_append_contracts() -> Resul let _: () = jvm.invoke_virtual(&writer, &writer.class_definition().name(), "close", "()V", ()).await?; assert_eq!(&*runtime.files.lock().unwrap()["output.txt"].lock().unwrap(), b"F"); - let null_path: ClassInstanceRef = None.into(); + let null_path: ClassInstanceRef = None.into(); let result = jvm.new_class("java/io/FileWriter", "(Ljava/lang/String;)V", (null_path,)).await; let Err(JavaError::JavaException(exception)) = result else { panic!("null path must throw NullPointerException"); diff --git a/java_runtime/tests/classes/java/io/test_input_stream_reader.rs b/rustjava-runtime/tests/classes/java/io/test_input_stream_reader.rs similarity index 98% rename from java_runtime/tests/classes/java/io/test_input_stream_reader.rs rename to rustjava-runtime/tests/classes/java/io/test_input_stream_reader.rs index 37489932..ab8e68b9 100644 --- a/java_runtime/tests/classes/java/io/test_input_stream_reader.rs +++ b/rustjava-runtime/tests/classes/java/io/test_input_stream_reader.rs @@ -1,11 +1,11 @@ use alloc::{boxed::Box, collections::BTreeMap, vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::classes::java::lang::Object; -use java_runtime::{RuntimeClassProto, RuntimeContext}; use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, Jvm, Result, runtime::JavaLangString}; -use jvm_rust::ClassDefinitionImpl; +use jvm_bytecode::ClassDefinitionImpl; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::classes::java::lang::Object; +use rustjava_runtime::{RuntimeClassProto, RuntimeContext}; use test_utils::{TestRuntime, create_test_jvm, test_jvm}; diff --git a/java_runtime/tests/classes/java/io/test_output_stream_close.rs b/rustjava-runtime/tests/classes/java/io/test_output_stream_close.rs similarity index 97% rename from java_runtime/tests/classes/java/io/test_output_stream_close.rs rename to rustjava-runtime/tests/classes/java/io/test_output_stream_close.rs index ce23f754..0fb2c3fb 100644 --- a/java_runtime/tests/classes/java/io/test_output_stream_close.rs +++ b/rustjava-runtime/tests/classes/java/io/test_output_stream_close.rs @@ -1,10 +1,10 @@ use alloc::{boxed::Box, collections::BTreeMap, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::{RuntimeClassProto, RuntimeContext, classes::java::io::OutputStream}; use jvm::{Array, ClassInstanceRef, JavaError, Jvm, Result}; -use jvm_rust::ClassDefinitionImpl; +use jvm_bytecode::ClassDefinitionImpl; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{RuntimeClassProto, RuntimeContext, classes::java::io::OutputStream}; use test_utils::{TestRuntime, create_test_jvm}; struct CloseProbeOutputStream; diff --git a/java_runtime/tests/classes/java/io/test_output_stream_writer.rs b/rustjava-runtime/tests/classes/java/io/test_output_stream_writer.rs similarity index 100% rename from java_runtime/tests/classes/java/io/test_output_stream_writer.rs rename to rustjava-runtime/tests/classes/java/io/test_output_stream_writer.rs diff --git a/java_runtime/tests/classes/java/io/test_print_stream.rs b/rustjava-runtime/tests/classes/java/io/test_print_stream.rs similarity index 99% rename from java_runtime/tests/classes/java/io/test_print_stream.rs rename to rustjava-runtime/tests/classes/java/io/test_print_stream.rs index 5c8d4a01..1e8c80b9 100644 --- a/java_runtime/tests/classes/java/io/test_print_stream.rs +++ b/rustjava-runtime/tests/classes/java/io/test_print_stream.rs @@ -1,15 +1,15 @@ use alloc::{boxed::Box, collections::BTreeMap, format, vec, vec::Vec}; use core::time::Duration; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::classes::java::{ +use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, JavaValue, Jvm, Result, runtime::JavaLangString}; +use jvm_bytecode::ClassDefinitionImpl; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::classes::java::{ io::{ByteArrayOutputStream, OutputStream, OutputStreamWriter, PrintStream}, lang::{Object, String}, }; -use java_runtime::{RuntimeClassProto, RuntimeContext}; -use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, JavaValue, Jvm, Result, runtime::JavaLangString}; -use jvm_rust::ClassDefinitionImpl; +use rustjava_runtime::{RuntimeClassProto, RuntimeContext}; use test_utils::{TestRuntime, create_test_jvm, test_jvm}; diff --git a/java_runtime/tests/classes/java/io/test_print_writer.rs b/rustjava-runtime/tests/classes/java/io/test_print_writer.rs similarity index 99% rename from java_runtime/tests/classes/java/io/test_print_writer.rs rename to rustjava-runtime/tests/classes/java/io/test_print_writer.rs index eeca80e4..b63d1a7e 100644 --- a/java_runtime/tests/classes/java/io/test_print_writer.rs +++ b/rustjava-runtime/tests/classes/java/io/test_print_writer.rs @@ -1,17 +1,17 @@ use alloc::{boxed::Box, collections::BTreeMap, format, vec, vec::Vec}; use core::time::Duration; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::{ +use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, Jvm, Result, runtime::JavaLangString}; +use jvm_bytecode::ClassDefinitionImpl; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{ RuntimeClassProto, RuntimeContext, classes::java::{ io::{OutputStream, PrintWriter, Writer}, lang::{Object, String, StringBuffer}, }, }; -use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, Jvm, Result, runtime::JavaLangString}; -use jvm_rust::ClassDefinitionImpl; use test_utils::{TestRuntime, create_test_jvm, test_jvm}; diff --git a/java_runtime/tests/classes/java/io/test_random_access_file.rs b/rustjava-runtime/tests/classes/java/io/test_random_access_file.rs similarity index 100% rename from java_runtime/tests/classes/java/io/test_random_access_file.rs rename to rustjava-runtime/tests/classes/java/io/test_random_access_file.rs diff --git a/java_runtime/tests/classes/java/io/test_stream_locking.rs b/rustjava-runtime/tests/classes/java/io/test_stream_locking.rs similarity index 98% rename from java_runtime/tests/classes/java/io/test_stream_locking.rs rename to rustjava-runtime/tests/classes/java/io/test_stream_locking.rs index 61c649d5..4bd93eb8 100644 --- a/java_runtime/tests/classes/java/io/test_stream_locking.rs +++ b/rustjava-runtime/tests/classes/java/io/test_stream_locking.rs @@ -1,17 +1,17 @@ use alloc::{boxed::Box, collections::BTreeMap, vec}; use core::time::Duration; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::{ +use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, Jvm, Result, runtime::JavaLangString}; +use jvm_bytecode::ClassDefinitionImpl; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{ RuntimeClassProto, RuntimeContext, classes::java::{ io::{BufferedWriter, Writer}, lang::Object, }, }; -use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, Jvm, Result, runtime::JavaLangString}; -use jvm_rust::ClassDefinitionImpl; use test_utils::{TestRuntime, create_test_jvm}; struct LockCheckingWriter; diff --git a/java_runtime/tests/classes/java/io/test_string_writer.rs b/rustjava-runtime/tests/classes/java/io/test_string_writer.rs similarity index 98% rename from java_runtime/tests/classes/java/io/test_string_writer.rs rename to rustjava-runtime/tests/classes/java/io/test_string_writer.rs index c2178718..b093f681 100644 --- a/java_runtime/tests/classes/java/io/test_string_writer.rs +++ b/rustjava-runtime/tests/classes/java/io/test_string_writer.rs @@ -1,7 +1,7 @@ use alloc::vec; -use java_runtime::classes::java::lang::Object; use jvm::{ClassInstanceRef, JavaChar, JavaError, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::lang::Object; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/lang/mod.rs b/rustjava-runtime/tests/classes/java/lang/mod.rs similarity index 100% rename from java_runtime/tests/classes/java/lang/mod.rs rename to rustjava-runtime/tests/classes/java/lang/mod.rs diff --git a/java_runtime/tests/classes/java/lang/test_boolean.rs b/rustjava-runtime/tests/classes/java/lang/test_boolean.rs similarity index 99% rename from java_runtime/tests/classes/java/lang/test_boolean.rs rename to rustjava-runtime/tests/classes/java/lang/test_boolean.rs index 4aa44c0b..83e24a69 100644 --- a/java_runtime/tests/classes/java/lang/test_boolean.rs +++ b/rustjava-runtime/tests/classes/java/lang/test_boolean.rs @@ -1,5 +1,5 @@ -use java_runtime::classes::java::lang::{Boolean, Object, String}; use jvm::{ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::lang::{Boolean, Object, String}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/lang/test_byte.rs b/rustjava-runtime/tests/classes/java/lang/test_byte.rs similarity index 96% rename from java_runtime/tests/classes/java/lang/test_byte.rs rename to rustjava-runtime/tests/classes/java/lang/test_byte.rs index a2c838d4..bd2e10b8 100644 --- a/java_runtime/tests/classes/java/lang/test_byte.rs +++ b/rustjava-runtime/tests/classes/java/lang/test_byte.rs @@ -1,5 +1,5 @@ -use java_runtime::classes::java::lang::{Byte, String}; use jvm::{ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::lang::{Byte, String}; use test_utils::test_jvm; @@ -37,7 +37,7 @@ async fn test_byte_api() -> Result<()> { .await?, -2.0 ); - let text: jvm::ClassInstanceRef = jvm + let text: jvm::ClassInstanceRef = jvm .invoke_virtual(&value, &value.class_definition().name(), "toString", "()Ljava/lang/String;", ()) .await?; assert_eq!(JavaLangString::to_rust_string(&jvm, &text).await?, "-2"); @@ -46,7 +46,7 @@ async fn test_byte_api() -> Result<()> { let max = jvm.get_static_field::("java/lang/Byte", "MAX_VALUE", "B").await?; assert_eq!((min, max), (i8::MIN, i8::MAX)); let typ = jvm.get_static_field("java/lang/Byte", "TYPE", "Ljava/lang/Class;").await?; - let name: jvm::ClassInstanceRef = jvm + let name: jvm::ClassInstanceRef = jvm .invoke_virtual(&typ, &typ.class_definition().name(), "getName", "()Ljava/lang/String;", ()) .await?; assert_eq!(JavaLangString::to_rust_string(&jvm, &name).await?, "byte"); diff --git a/java_runtime/tests/classes/java/lang/test_character.rs b/rustjava-runtime/tests/classes/java/lang/test_character.rs similarity index 99% rename from java_runtime/tests/classes/java/lang/test_character.rs rename to rustjava-runtime/tests/classes/java/lang/test_character.rs index cc1884c1..103ae5da 100644 --- a/java_runtime/tests/classes/java/lang/test_character.rs +++ b/rustjava-runtime/tests/classes/java/lang/test_character.rs @@ -1,5 +1,5 @@ -use java_runtime::classes::java::lang::{Character, String}; use jvm::{ClassInstanceRef, JavaChar, JavaError, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::lang::{Character, String}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/lang/test_class.rs b/rustjava-runtime/tests/classes/java/lang/test_class.rs similarity index 98% rename from java_runtime/tests/classes/java/lang/test_class.rs rename to rustjava-runtime/tests/classes/java/lang/test_class.rs index bb155ed2..e1f21144 100644 --- a/java_runtime/tests/classes/java/lang/test_class.rs +++ b/rustjava-runtime/tests/classes/java/lang/test_class.rs @@ -1,5 +1,9 @@ -use java_constants::MethodAccessFlags; -use java_runtime::{ +use jvm::{ + Array, ClassInstanceRef, JavaError, Jvm, Result, + runtime::{JavaLangClass, JavaLangString}, +}; +use jvm_types::MethodAccessFlags; +use rustjava_runtime::{ Runtime, classes::java::{ lang::{Class, ClassLoader, String}, @@ -7,10 +11,6 @@ use java_runtime::{ }, get_bootstrap_class_loader, }; -use jvm::{ - Array, ClassInstanceRef, JavaError, Jvm, Result, - runtime::{JavaLangClass, JavaLangString}, -}; use test_utils::{TestRuntime, test_jvm}; @@ -448,7 +448,7 @@ async fn test_cldc_class_queries_and_new_instance() -> Result<()> { ); let object_class = jvm.resolve_class("java/lang/Object").await?.java_class(); - let instance: ClassInstanceRef = jvm + let instance: ClassInstanceRef = jvm .invoke_virtual( &object_class, &object_class.class_definition().name(), @@ -459,7 +459,7 @@ async fn test_cldc_class_queries_and_new_instance() -> Result<()> { .await?; assert!(jvm.is_instance(&**instance, "java/lang/Object")); - let result: Result> = jvm + let result: Result> = jvm .invoke_virtual( &runnable_class, &runnable_class.class_definition().name(), @@ -583,10 +583,10 @@ async fn test_define_class_translates_parser_errors_to_java_errors() -> Result<( .into(); let name: ClassInstanceRef = None.into(); - let mut unsupported_version = include_bytes!("../../../../../test_data/Hello.class").to_vec(); + let mut unsupported_version = include_bytes!("../../../../../test-data/Hello.class").to_vec(); unsupported_version[6..8].copy_from_slice(&71u16.to_be_bytes()); - let mut verification_error = include_bytes!("../../../../../test_data/MultiArray.class").to_vec(); + let mut verification_error = include_bytes!("../../../../../test-data/MultiArray.class").to_vec(); let multianewarray = [0x10, 0x0a, 0x10, 0x0a, 0x10, 0x0a, 0x10, 0x0a, 0x10, 0x0a, 0xc5, 0x00, 0x07, 0x05]; let multianewarray_offset = verification_error .windows(multianewarray.len()) diff --git a/java_runtime/tests/classes/java/lang/test_cldc11_exceptions.rs b/rustjava-runtime/tests/classes/java/lang/test_cldc11_exceptions.rs similarity index 97% rename from java_runtime/tests/classes/java/lang/test_cldc11_exceptions.rs rename to rustjava-runtime/tests/classes/java/lang/test_cldc11_exceptions.rs index 08ee8724..8b971a76 100644 --- a/java_runtime/tests/classes/java/lang/test_cldc11_exceptions.rs +++ b/rustjava-runtime/tests/classes/java/lang/test_cldc11_exceptions.rs @@ -1,6 +1,6 @@ -use java_constants::{ClassAccessFlags, MethodAccessFlags}; -use java_runtime::{classes::java::lang::String, get_runtime_class_proto}; use jvm::{ClassInstanceRef, Result, runtime::JavaLangString}; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{classes::java::lang::String, get_runtime_class_proto}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/lang/test_double.rs b/rustjava-runtime/tests/classes/java/lang/test_double.rs similarity index 99% rename from java_runtime/tests/classes/java/lang/test_double.rs rename to rustjava-runtime/tests/classes/java/lang/test_double.rs index 2916fa22..c22c0587 100644 --- a/java_runtime/tests/classes/java/lang/test_double.rs +++ b/rustjava-runtime/tests/classes/java/lang/test_double.rs @@ -1,5 +1,5 @@ -use java_runtime::classes::java::lang::{Double, String}; use jvm::{ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::lang::{Double, String}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/lang/test_float.rs b/rustjava-runtime/tests/classes/java/lang/test_float.rs similarity index 99% rename from java_runtime/tests/classes/java/lang/test_float.rs rename to rustjava-runtime/tests/classes/java/lang/test_float.rs index ffc01c04..29966e3f 100644 --- a/java_runtime/tests/classes/java/lang/test_float.rs +++ b/rustjava-runtime/tests/classes/java/lang/test_float.rs @@ -1,5 +1,5 @@ -use java_runtime::classes::java::lang::{Float, String}; use jvm::{ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::lang::{Float, String}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/lang/test_integer.rs b/rustjava-runtime/tests/classes/java/lang/test_integer.rs similarity index 99% rename from java_runtime/tests/classes/java/lang/test_integer.rs rename to rustjava-runtime/tests/classes/java/lang/test_integer.rs index 2e842d08..dc928140 100644 --- a/java_runtime/tests/classes/java/lang/test_integer.rs +++ b/rustjava-runtime/tests/classes/java/lang/test_integer.rs @@ -1,5 +1,5 @@ -use java_runtime::classes::java::lang::{Integer, Object, String}; use jvm::{ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::lang::{Integer, Object, String}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/lang/test_long.rs b/rustjava-runtime/tests/classes/java/lang/test_long.rs similarity index 98% rename from java_runtime/tests/classes/java/lang/test_long.rs rename to rustjava-runtime/tests/classes/java/lang/test_long.rs index ccbc9f2f..bafd4f71 100644 --- a/java_runtime/tests/classes/java/lang/test_long.rs +++ b/rustjava-runtime/tests/classes/java/lang/test_long.rs @@ -1,5 +1,5 @@ -use java_runtime::classes::java::lang::{Long, Object, String}; use jvm::{ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::lang::{Long, Object, String}; use test_utils::test_jvm; @@ -59,7 +59,7 @@ async fn test_long_api() -> Result<()> { (JavaLangString::from_rust_string(&jvm, "-1").await?,), ) .await?; - let hex: jvm::ClassInstanceRef = jvm + let hex: jvm::ClassInstanceRef = jvm .invoke_static("java/lang/Long", "toHexString", "(J)Ljava/lang/String;", (-1i64,)) .await?; assert_eq!(JavaLangString::to_rust_string(&jvm, &hex).await?, "ffffffffffffffff"); diff --git a/java_runtime/tests/classes/java/lang/test_math.rs b/rustjava-runtime/tests/classes/java/lang/test_math.rs similarity index 99% rename from java_runtime/tests/classes/java/lang/test_math.rs rename to rustjava-runtime/tests/classes/java/lang/test_math.rs index 0d63832c..a6e1d375 100644 --- a/java_runtime/tests/classes/java/lang/test_math.rs +++ b/rustjava-runtime/tests/classes/java/lang/test_math.rs @@ -1,7 +1,7 @@ -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::classes::java::lang::Math; -use java_runtime::classes::java::util::Random; use jvm::{ClassInstanceRef, Result}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::classes::java::lang::Math; +use rustjava_runtime::classes::java::util::Random; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/lang/test_number.rs b/rustjava-runtime/tests/classes/java/lang/test_number.rs similarity index 96% rename from java_runtime/tests/classes/java/lang/test_number.rs rename to rustjava-runtime/tests/classes/java/lang/test_number.rs index e5fa3277..b784cd24 100644 --- a/java_runtime/tests/classes/java/lang/test_number.rs +++ b/rustjava-runtime/tests/classes/java/lang/test_number.rs @@ -1,6 +1,6 @@ -use java_constants::{ClassAccessFlags, MethodAccessFlags}; -use java_runtime::classes::java::lang::{Comparable, Number}; use jvm::{JavaError, Result}; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; +use rustjava_runtime::classes::java::lang::{Comparable, Number}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/lang/test_object.rs b/rustjava-runtime/tests/classes/java/lang/test_object.rs similarity index 97% rename from java_runtime/tests/classes/java/lang/test_object.rs rename to rustjava-runtime/tests/classes/java/lang/test_object.rs index 2056d6da..a57ca059 100644 --- a/java_runtime/tests/classes/java/lang/test_object.rs +++ b/rustjava-runtime/tests/classes/java/lang/test_object.rs @@ -6,11 +6,11 @@ use core::{ use alloc::{boxed::Box, collections::btree_map::BTreeMap, sync::Arc, vec}; -use java_class_proto::JavaFieldProto; -use java_constants::{ClassAccessFlags, FieldAccessFlags}; -use java_runtime::{Runtime, RuntimeClassProto, SpawnCallback, classes::java::lang::Object}; use jvm::{Array, ClassInstanceRef, JavaError, Jvm, Result}; -use jvm_rust::ClassDefinitionImpl; +use jvm_bytecode::ClassDefinitionImpl; +use jvm_class_proto::JavaFieldProto; +use jvm_types::{ClassAccessFlags, FieldAccessFlags}; +use rustjava_runtime::{Runtime, RuntimeClassProto, SpawnCallback, classes::java::lang::Object}; use test_utils::{TestRuntime, create_test_jvm}; diff --git a/java_runtime/tests/classes/java/lang/test_short.rs b/rustjava-runtime/tests/classes/java/lang/test_short.rs similarity index 99% rename from java_runtime/tests/classes/java/lang/test_short.rs rename to rustjava-runtime/tests/classes/java/lang/test_short.rs index e1904582..dfa1e59f 100644 --- a/java_runtime/tests/classes/java/lang/test_short.rs +++ b/rustjava-runtime/tests/classes/java/lang/test_short.rs @@ -1,5 +1,5 @@ -use java_runtime::classes::java::lang::String; use jvm::{ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::lang::String; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/lang/test_string.rs b/rustjava-runtime/tests/classes/java/lang/test_string.rs similarity index 99% rename from java_runtime/tests/classes/java/lang/test_string.rs rename to rustjava-runtime/tests/classes/java/lang/test_string.rs index c04843f5..dd367b6f 100644 --- a/java_runtime/tests/classes/java/lang/test_string.rs +++ b/rustjava-runtime/tests/classes/java/lang/test_string.rs @@ -1,12 +1,12 @@ -use java_constants::{ClassAccessFlags, MethodAccessFlags}; -use java_runtime::{ +use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, Result, runtime::JavaLangString}; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{ classes::java::{ lang::{CharSequence, Object, String as JavaString}, util::regex::{Matcher, Pattern}, }, get_runtime_class_proto, }; -use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, Result, runtime::JavaLangString}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/lang/test_string_buffer.rs b/rustjava-runtime/tests/classes/java/lang/test_string_buffer.rs similarity index 97% rename from java_runtime/tests/classes/java/lang/test_string_buffer.rs rename to rustjava-runtime/tests/classes/java/lang/test_string_buffer.rs index 5435eee6..3fb6c4a4 100644 --- a/java_runtime/tests/classes/java/lang/test_string_buffer.rs +++ b/rustjava-runtime/tests/classes/java/lang/test_string_buffer.rs @@ -1,9 +1,9 @@ -use java_constants::{ClassAccessFlags, MethodAccessFlags}; -use java_runtime::{ +use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, Result, runtime::JavaLangString}; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{ classes::java::lang::{CharSequence, String as JavaString, StringBuffer}, get_runtime_class_proto, }; -use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, Result, runtime::JavaLangString}; use test_utils::test_jvm; @@ -172,7 +172,7 @@ async fn test_sb_01_constructors_capacity_and_exceptions() -> Result<()> { }; assert!(jvm.is_instance(&*exception, "java/lang/NegativeArraySizeException")); - let null = ClassInstanceRef::::new(None); + let null = ClassInstanceRef::::new(None); let result = jvm.new_class("java/lang/StringBuffer", "(Ljava/lang/String;)V", (null,)).await; let Err(JavaError::JavaException(exception)) = result else { panic!("StringBuffer(null) must throw"); @@ -440,7 +440,7 @@ async fn test_sb_05_append_float_double_and_char_array() -> Result<()> { }; assert!(jvm.is_instance(&*exception, "java/lang/NullPointerException")); - let null_string: ClassInstanceRef = None.into(); + let null_string: ClassInstanceRef = None.into(); let _: ClassInstanceRef = jvm .invoke_virtual( &buffer, @@ -450,7 +450,7 @@ async fn test_sb_05_append_float_double_and_char_array() -> Result<()> { (null_string,), ) .await?; - let null_object: ClassInstanceRef = None.into(); + let null_object: ClassInstanceRef = None.into(); let _: ClassInstanceRef = jvm .invoke_virtual( &buffer, @@ -581,7 +581,7 @@ async fn test_sb_06_insert_overloads_and_boundaries() -> Result<()> { .await?; assert_eq!(JavaLangString::to_rust_string(&jvm, &text).await?, "SOtrue!12341.02.0abCstringbuffernull"); - let null_string: ClassInstanceRef = None.into(); + let null_string: ClassInstanceRef = None.into(); let _: ClassInstanceRef = jvm .invoke_virtual( &buffer, @@ -596,7 +596,7 @@ async fn test_sb_06_insert_overloads_and_boundaries() -> Result<()> { .await?; assert_eq!(JavaLangString::to_rust_string(&jvm, &text).await?, "null"); - let null_object: ClassInstanceRef = None.into(); + let null_object: ClassInstanceRef = None.into(); let _: ClassInstanceRef = jvm .invoke_virtual( &buffer, @@ -811,7 +811,7 @@ async fn test_sb_09_substring_uses_logical_count() -> Result<()> { assert_eq!(JavaLangString::to_rust_string(&jvm, &middle).await?, "bcd"); for (start, end) in [(-1, 1), (3, 2), (0, 7)] { - let result: Result> = jvm + let result: Result> = jvm .invoke_virtual(&buffer, "java/lang/StringBuffer", "substring", "(II)Ljava/lang/String;", (start, end)) .await; let Err(JavaError::JavaException(exception)) = result else { @@ -881,7 +881,7 @@ async fn test_sb_10_replace_clamps_end_and_checks_ranges() -> Result<()> { ); } - let null: ClassInstanceRef = None.into(); + let null: ClassInstanceRef = None.into(); let result: Result> = jvm .invoke_virtual( &buffer, @@ -910,7 +910,7 @@ async fn test_sb_10_replace_clamps_end_and_checks_ranges() -> Result<()> { before_capacity ); - let null: ClassInstanceRef = None.into(); + let null: ClassInstanceRef = None.into(); let result: Result> = jvm .invoke_virtual( &buffer, @@ -947,7 +947,7 @@ async fn test_sb_11_string_arguments_backed_by_shared_substring() -> Result<()> let jvm = test_jvm().await?; let hello_parent = JavaLangString::from_rust_string(&jvm, "xxHelloyy").await?; - let hello: ClassInstanceRef = jvm + let hello: ClassInstanceRef = jvm .invoke_virtual( &hello_parent, &hello_parent.class_definition().name(), @@ -957,7 +957,7 @@ async fn test_sb_11_string_arguments_backed_by_shared_substring() -> Result<()> ) .await?; let world_parent = JavaLangString::from_rust_string(&jvm, "zzWorldzz").await?; - let world: ClassInstanceRef = jvm + let world: ClassInstanceRef = jvm .invoke_virtual( &world_parent, &world_parent.class_definition().name(), @@ -1071,7 +1071,7 @@ async fn test_sb_13_insert_substring_then_reverse_and_delete() -> Result<()> { let jvm = test_jvm().await?; let parent = JavaLangString::from_rust_string(&jvm, "xxHelloyy").await?; - let sub: ClassInstanceRef = jvm + let sub: ClassInstanceRef = jvm .invoke_virtual(&parent, &parent.class_definition().name(), "substring", "(II)Ljava/lang/String;", (2, 7)) .await?; @@ -1130,7 +1130,7 @@ async fn test_sb_14_append_surrogate_substring_preserves_code_unit() -> Result<( let mut chars = jvm.instantiate_array("C", 3).await?; jvm.store_array(&mut chars, 0, [0x61 as JavaChar, 0xd800, 0x62]).await?; let string = jvm.new_class("java/lang/String", "([C)V", (chars,)).await?; - let sub: ClassInstanceRef = jvm + let sub: ClassInstanceRef = jvm .invoke_virtual(&string, &string.class_definition().name(), "substring", "(II)Ljava/lang/String;", (1, 2)) .await?; @@ -1144,7 +1144,7 @@ async fn test_sb_14_append_surrogate_substring_preserves_code_unit() -> Result<( (sub,), ) .await?; - let text: ClassInstanceRef = jvm + let text: ClassInstanceRef = jvm .invoke_virtual(&buffer, "java/lang/StringBuffer", "toString", "()Ljava/lang/String;", ()) .await?; assert_eq!(jvm.invoke_virtual::<_, i32>(&text, "java/lang/String", "length", "()I", ()).await?, 1); diff --git a/java_runtime/tests/classes/java/lang/test_string_builder.rs b/rustjava-runtime/tests/classes/java/lang/test_string_builder.rs similarity index 97% rename from java_runtime/tests/classes/java/lang/test_string_builder.rs rename to rustjava-runtime/tests/classes/java/lang/test_string_builder.rs index 41b3829b..b77cb4d5 100644 --- a/java_runtime/tests/classes/java/lang/test_string_builder.rs +++ b/rustjava-runtime/tests/classes/java/lang/test_string_builder.rs @@ -1,6 +1,6 @@ -use java_constants::{ClassAccessFlags, MethodAccessFlags}; -use java_runtime::{classes::java::lang::Object, get_runtime_class_proto}; use jvm::{ClassInstanceRef, JavaChar, Result, runtime::JavaLangString}; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{classes::java::lang::Object, get_runtime_class_proto}; use test_utils::test_jvm; #[test] @@ -138,7 +138,7 @@ async fn string_builder_mutation_queries_and_appendable_bridge_use_utf16() -> Re let builder = jvm.new_class("java/lang/StringBuilder", "()V", ()).await?; let text = JavaLangString::from_utf16(&jvm, vec!['A' as JavaChar, 0xd83d, 0xde00]).await?; - let text: ClassInstanceRef = text.into(); + let text: ClassInstanceRef = text.into(); let _: ClassInstanceRef = jvm .invoke_virtual( &builder, diff --git a/java_runtime/tests/classes/java/lang/test_system.rs b/rustjava-runtime/tests/classes/java/lang/test_system.rs similarity index 98% rename from java_runtime/tests/classes/java/lang/test_system.rs rename to rustjava-runtime/tests/classes/java/lang/test_system.rs index 4ad10509..c8f53c68 100644 --- a/java_runtime/tests/classes/java/lang/test_system.rs +++ b/rustjava-runtime/tests/classes/java/lang/test_system.rs @@ -1,7 +1,8 @@ use alloc::{collections::BTreeMap, vec}; -use java_constants::{FieldAccessFlags, MethodAccessFlags}; -use java_runtime::{ +use jvm::{ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use jvm_types::{FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{ Runtime, classes::java::{ io::{InputStream, PrintStream}, @@ -9,7 +10,6 @@ use java_runtime::{ util::Properties, }, }; -use jvm::{ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; use test_utils::{TestRuntime, create_test_jvm}; #[tokio::test] diff --git a/java_runtime/tests/classes/java/lang/test_thread.rs b/rustjava-runtime/tests/classes/java/lang/test_thread.rs similarity index 97% rename from java_runtime/tests/classes/java/lang/test_thread.rs rename to rustjava-runtime/tests/classes/java/lang/test_thread.rs index 6755c893..5b70b84d 100644 --- a/java_runtime/tests/classes/java/lang/test_thread.rs +++ b/rustjava-runtime/tests/classes/java/lang/test_thread.rs @@ -1,10 +1,10 @@ use alloc::{boxed::Box, collections::BTreeMap, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::{RuntimeClassProto, RuntimeContext}; use jvm::{ClassInstanceRef, JavaError, Jvm, Result, runtime::JavaLangString}; -use jvm_rust::ClassDefinitionImpl; +use jvm_bytecode::ClassDefinitionImpl; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{RuntimeClassProto, RuntimeContext}; use test_utils::{TestRuntime, create_test_jvm}; @@ -177,7 +177,7 @@ async fn test_thread_jdk12_metadata_name_interrupt_and_daemon_state() -> Result< &thread.class_definition().name(), "setName", "(Ljava/lang/String;)V", - (ClassInstanceRef::::new(None),), + (ClassInstanceRef::::new(None),), ) .await; let Err(JavaError::JavaException(exception)) = result else { diff --git a/java_runtime/tests/classes/java/lang/test_throwable.rs b/rustjava-runtime/tests/classes/java/lang/test_throwable.rs similarity index 98% rename from java_runtime/tests/classes/java/lang/test_throwable.rs rename to rustjava-runtime/tests/classes/java/lang/test_throwable.rs index 1a253139..d7b34138 100644 --- a/java_runtime/tests/classes/java/lang/test_throwable.rs +++ b/rustjava-runtime/tests/classes/java/lang/test_throwable.rs @@ -1,7 +1,7 @@ use alloc::boxed::Box; -use java_runtime::classes::java::lang::String; use jvm::{ClassInstance, ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::lang::String; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/mod.rs b/rustjava-runtime/tests/classes/java/mod.rs similarity index 100% rename from java_runtime/tests/classes/java/mod.rs rename to rustjava-runtime/tests/classes/java/mod.rs diff --git a/java_runtime/tests/classes/java/net/mod.rs b/rustjava-runtime/tests/classes/java/net/mod.rs similarity index 100% rename from java_runtime/tests/classes/java/net/mod.rs rename to rustjava-runtime/tests/classes/java/net/mod.rs diff --git a/java_runtime/tests/classes/java/net/test_jar_url_connection.rs b/rustjava-runtime/tests/classes/java/net/test_jar_url_connection.rs similarity index 100% rename from java_runtime/tests/classes/java/net/test_jar_url_connection.rs rename to rustjava-runtime/tests/classes/java/net/test_jar_url_connection.rs diff --git a/java_runtime/tests/classes/java/net/test_url_class_loader.rs b/rustjava-runtime/tests/classes/java/net/test_url_class_loader.rs similarity index 96% rename from java_runtime/tests/classes/java/net/test_url_class_loader.rs rename to rustjava-runtime/tests/classes/java/net/test_url_class_loader.rs index c9c78fdc..34d7de33 100644 --- a/java_runtime/tests/classes/java/net/test_url_class_loader.rs +++ b/rustjava-runtime/tests/classes/java/net/test_url_class_loader.rs @@ -1,13 +1,13 @@ use alloc::vec; -use java_runtime::classes::java::{lang::Class, net::URL}; use jvm::{ClassInstanceRef, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::{lang::Class, net::URL}; use test_utils::test_jvm_filesystem; #[tokio::test] async fn test_jar_loading() -> Result<()> { - let jar = include_bytes!("../../../../../test_data/test.jar"); + let jar = include_bytes!("../../../../../test-data/test.jar"); let filesystem = [("test.jar".into(), jar.to_vec())].into_iter().collect(); let jvm = test_jvm_filesystem(filesystem).await?; @@ -56,7 +56,7 @@ async fn test_jar_loading() -> Result<()> { #[tokio::test] async fn test_jar_loading_with_slash() -> Result<()> { - let jar = include_bytes!("../../../../../test_data/test.jar"); + let jar = include_bytes!("../../../../../test-data/test.jar"); let filesystem = [("test.jar".into(), jar.to_vec())].into_iter().collect(); let jvm = test_jvm_filesystem(filesystem).await?; @@ -143,7 +143,7 @@ async fn test_load_from_dir() -> Result<()> { #[tokio::test] async fn test_jar_loading_no_file() -> Result<()> { - let jar = include_bytes!("../../../../../test_data/test.jar"); + let jar = include_bytes!("../../../../../test-data/test.jar"); let filesystem = [("test.jar".into(), jar.to_vec())].into_iter().collect(); let jvm = test_jvm_filesystem(filesystem).await?; @@ -203,7 +203,7 @@ async fn test_load_from_dir_no_file() -> Result<()> { #[tokio::test] async fn test_missing_url_does_not_prevent_later_jar_lookup() -> Result<()> { - let jar = include_bytes!("../../../../../test_data/test.jar"); + let jar = include_bytes!("../../../../../test-data/test.jar"); let filesystem = [("test.jar".into(), jar.to_vec())].into_iter().collect(); let jvm = test_jvm_filesystem(filesystem).await?; diff --git a/java_runtime/tests/classes/java/text/mod.rs b/rustjava-runtime/tests/classes/java/text/mod.rs similarity index 100% rename from java_runtime/tests/classes/java/text/mod.rs rename to rustjava-runtime/tests/classes/java/text/mod.rs diff --git a/java_runtime/tests/classes/java/text/test_date_format.rs b/rustjava-runtime/tests/classes/java/text/test_date_format.rs similarity index 99% rename from java_runtime/tests/classes/java/text/test_date_format.rs rename to rustjava-runtime/tests/classes/java/text/test_date_format.rs index 8f677fb2..aaae41ab 100644 --- a/java_runtime/tests/classes/java/text/test_date_format.rs +++ b/rustjava-runtime/tests/classes/java/text/test_date_format.rs @@ -1,9 +1,9 @@ -use java_runtime::classes::java::{ +use jvm::{ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::{ lang::{String, StringBuffer}, text::{DateFormat, FieldPosition, ParsePosition, SimpleDateFormat}, util::{Calendar, Date, SimpleTimeZone, TimeZone}, }; -use jvm::{ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/text/test_format.rs b/rustjava-runtime/tests/classes/java/text/test_format.rs similarity index 99% rename from java_runtime/tests/classes/java/text/test_format.rs rename to rustjava-runtime/tests/classes/java/text/test_format.rs index 7d7f997f..673cb749 100644 --- a/java_runtime/tests/classes/java/text/test_format.rs +++ b/rustjava-runtime/tests/classes/java/text/test_format.rs @@ -1,8 +1,8 @@ -use java_runtime::classes::java::{ +use jvm::{ClassInstanceRef, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::{ lang::{Long, Object, String}, text::{FieldPosition, Format, NumberFormat, ParseException, ParsePosition}, }; -use jvm::{ClassInstanceRef, Result, runtime::JavaLangString}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/text/test_number_format.rs b/rustjava-runtime/tests/classes/java/text/test_number_format.rs similarity index 99% rename from java_runtime/tests/classes/java/text/test_number_format.rs rename to rustjava-runtime/tests/classes/java/text/test_number_format.rs index ad8d0ae1..fb20a176 100644 --- a/java_runtime/tests/classes/java/text/test_number_format.rs +++ b/rustjava-runtime/tests/classes/java/text/test_number_format.rs @@ -1,9 +1,9 @@ -use java_runtime::classes::java::{ +use jvm::{ClassInstanceRef, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::{ lang::{Double, Long, Number, String, StringBuffer}, text::{DecimalFormat, FieldPosition, NumberFormat, ParsePosition}, util::Locale, }; -use jvm::{ClassInstanceRef, Result, runtime::JavaLangString}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/util/jar/mod.rs b/rustjava-runtime/tests/classes/java/util/jar/mod.rs similarity index 100% rename from java_runtime/tests/classes/java/util/jar/mod.rs rename to rustjava-runtime/tests/classes/java/util/jar/mod.rs diff --git a/java_runtime/tests/classes/java/util/jar/test_attributes.rs b/rustjava-runtime/tests/classes/java/util/jar/test_attributes.rs similarity index 95% rename from java_runtime/tests/classes/java/util/jar/test_attributes.rs rename to rustjava-runtime/tests/classes/java/util/jar/test_attributes.rs index eb9145da..5f92b91e 100644 --- a/java_runtime/tests/classes/java/util/jar/test_attributes.rs +++ b/rustjava-runtime/tests/classes/java/util/jar/test_attributes.rs @@ -1,5 +1,5 @@ -use java_runtime::classes::java::lang::{Object, String}; use jvm::{ClassInstanceRef, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::lang::{Object, String}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/util/jar/test_jar_file.rs b/rustjava-runtime/tests/classes/java/util/jar/test_jar_file.rs similarity index 95% rename from java_runtime/tests/classes/java/util/jar/test_jar_file.rs rename to rustjava-runtime/tests/classes/java/util/jar/test_jar_file.rs index a4d9f2df..2cbb9194 100644 --- a/java_runtime/tests/classes/java/util/jar/test_jar_file.rs +++ b/rustjava-runtime/tests/classes/java/util/jar/test_jar_file.rs @@ -1,11 +1,11 @@ -use java_runtime::classes::java::util::jar::JarEntry; use jvm::{ClassInstanceRef, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::util::jar::JarEntry; use test_utils::test_jvm_filesystem; #[tokio::test] async fn test_jar_manifest() -> Result<()> { - let jar = include_bytes!("../../../../../../test_data/test.jar"); + let jar = include_bytes!("../../../../../../test-data/test.jar"); let filesystem = [("test.jar".into(), jar.to_vec())].into_iter().collect(); let jvm = test_jvm_filesystem(filesystem).await?; @@ -45,7 +45,7 @@ async fn test_jar_manifest() -> Result<()> { #[tokio::test] async fn test_entries() -> Result<()> { - let jar = include_bytes!("../../../../../../test_data/test.jar"); + let jar = include_bytes!("../../../../../../test-data/test.jar"); let filesystem = [("test.jar".into(), jar.to_vec())].into_iter().collect(); let jvm = test_jvm_filesystem(filesystem).await?; diff --git a/java_runtime/tests/classes/java/util/jar/test_manifest.rs b/rustjava-runtime/tests/classes/java/util/jar/test_manifest.rs similarity index 100% rename from java_runtime/tests/classes/java/util/jar/test_manifest.rs rename to rustjava-runtime/tests/classes/java/util/jar/test_manifest.rs diff --git a/java_runtime/tests/classes/java/util/logging/mod.rs b/rustjava-runtime/tests/classes/java/util/logging/mod.rs similarity index 100% rename from java_runtime/tests/classes/java/util/logging/mod.rs rename to rustjava-runtime/tests/classes/java/util/logging/mod.rs diff --git a/java_runtime/tests/classes/java/util/logging/test_handlers.rs b/rustjava-runtime/tests/classes/java/util/logging/test_handlers.rs similarity index 98% rename from java_runtime/tests/classes/java/util/logging/test_handlers.rs rename to rustjava-runtime/tests/classes/java/util/logging/test_handlers.rs index fbae0851..a7a33f9a 100644 --- a/java_runtime/tests/classes/java/util/logging/test_handlers.rs +++ b/rustjava-runtime/tests/classes/java/util/logging/test_handlers.rs @@ -1,8 +1,10 @@ use alloc::{boxed::Box, collections::btree_map::BTreeMap, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::{ +use jvm::{Array, ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; +use jvm_bytecode::ClassDefinitionImpl; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{ RuntimeClassProto, RuntimeContext, classes::java::{ io::{ByteArrayOutputStream, OutputStream}, @@ -10,8 +12,6 @@ use java_runtime::{ util::logging::{Filter, Formatter, Level, LogRecord, SimpleFormatter, StreamHandler}, }, }; -use jvm::{Array, ClassInstanceRef, Jvm, Result, runtime::JavaLangString}; -use jvm_rust::ClassDefinitionImpl; use test_utils::{TestRuntime, create_test_jvm}; struct ConfigurableFilter; diff --git a/java_runtime/tests/classes/java/util/logging/test_level.rs b/rustjava-runtime/tests/classes/java/util/logging/test_level.rs similarity index 98% rename from java_runtime/tests/classes/java/util/logging/test_level.rs rename to rustjava-runtime/tests/classes/java/util/logging/test_level.rs index d35156f3..0b43dc2e 100644 --- a/java_runtime/tests/classes/java/util/logging/test_level.rs +++ b/rustjava-runtime/tests/classes/java/util/logging/test_level.rs @@ -1,9 +1,9 @@ -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::{ +use jvm::{ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{ classes::java::{lang::String, util::logging::Level}, get_runtime_class_proto, }; -use jvm::{ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; use test_utils::test_jvm; #[test] diff --git a/java_runtime/tests/classes/java/util/logging/test_log_record.rs b/rustjava-runtime/tests/classes/java/util/logging/test_log_record.rs similarity index 99% rename from java_runtime/tests/classes/java/util/logging/test_log_record.rs rename to rustjava-runtime/tests/classes/java/util/logging/test_log_record.rs index 3178fa16..963effff 100644 --- a/java_runtime/tests/classes/java/util/logging/test_log_record.rs +++ b/rustjava-runtime/tests/classes/java/util/logging/test_log_record.rs @@ -1,8 +1,8 @@ -use java_runtime::classes::java::{ +use jvm::{Array, ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::{ lang::{Object, String}, util::logging::{Level, LogRecord}, }; -use jvm::{Array, ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; use test_utils::test_jvm; #[tokio::test] diff --git a/java_runtime/tests/classes/java/util/logging/test_logger.rs b/rustjava-runtime/tests/classes/java/util/logging/test_logger.rs similarity index 99% rename from java_runtime/tests/classes/java/util/logging/test_logger.rs rename to rustjava-runtime/tests/classes/java/util/logging/test_logger.rs index e755a188..2945e1e3 100644 --- a/java_runtime/tests/classes/java/util/logging/test_logger.rs +++ b/rustjava-runtime/tests/classes/java/util/logging/test_logger.rs @@ -1,9 +1,9 @@ -use java_runtime::classes::java::{ +use jvm::{Array, ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::{ io::{ByteArrayOutputStream, OutputStream}, lang::String, util::logging::{Formatter, Handler, Level, LogManager, Logger}, }; -use jvm::{Array, ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; use test_utils::test_jvm; #[tokio::test] diff --git a/java_runtime/tests/classes/java/util/mod.rs b/rustjava-runtime/tests/classes/java/util/mod.rs similarity index 100% rename from java_runtime/tests/classes/java/util/mod.rs rename to rustjava-runtime/tests/classes/java/util/mod.rs diff --git a/java_runtime/tests/classes/java/util/regex/mod.rs b/rustjava-runtime/tests/classes/java/util/regex/mod.rs similarity index 100% rename from java_runtime/tests/classes/java/util/regex/mod.rs rename to rustjava-runtime/tests/classes/java/util/regex/mod.rs diff --git a/java_runtime/tests/classes/java/util/regex/test_matcher.rs b/rustjava-runtime/tests/classes/java/util/regex/test_matcher.rs similarity index 99% rename from java_runtime/tests/classes/java/util/regex/test_matcher.rs rename to rustjava-runtime/tests/classes/java/util/regex/test_matcher.rs index f53a195d..74008a5f 100644 --- a/java_runtime/tests/classes/java/util/regex/test_matcher.rs +++ b/rustjava-runtime/tests/classes/java/util/regex/test_matcher.rs @@ -1,8 +1,10 @@ use alloc::{boxed::Box, collections::BTreeMap, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::{ +use jvm::{ClassInstanceRef, JavaChar, JavaError, Result, runtime::JavaLangString}; +use jvm_bytecode::ClassDefinitionImpl; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{ RuntimeClassProto, RuntimeContext, classes::java::{ lang::{CharSequence, String, StringBuffer}, @@ -10,8 +12,6 @@ use java_runtime::{ }, get_runtime_class_proto, }; -use jvm::{ClassInstanceRef, JavaChar, JavaError, Result, runtime::JavaLangString}; -use jvm_rust::ClassDefinitionImpl; use test_utils::{TestRuntime, create_test_jvm, test_jvm}; @@ -681,7 +681,7 @@ async fn invalid_find_start_is_checked_before_creating_an_input_snapshot() -> Re let jvm = create_test_jvm(runtime.clone()).await?; let class = Box::new(ClassDefinitionImpl::from_class_proto( SnapshotFailingCharSequence::as_proto(), - Box::new(runtime) as Box, + Box::new(runtime) as Box, )); jvm.register_class(class, None).await?; @@ -731,7 +731,7 @@ async fn valid_find_start_resets_state_before_creating_an_input_snapshot() -> Re let jvm = create_test_jvm(runtime.clone()).await?; let class = Box::new(ClassDefinitionImpl::from_class_proto( SnapshotFailingCharSequence::as_proto(), - Box::new(runtime) as Box, + Box::new(runtime) as Box, )); jvm.register_class(class, None).await?; diff --git a/java_runtime/tests/classes/java/util/regex/test_pattern.rs b/rustjava-runtime/tests/classes/java/util/regex/test_pattern.rs similarity index 99% rename from java_runtime/tests/classes/java/util/regex/test_pattern.rs rename to rustjava-runtime/tests/classes/java/util/regex/test_pattern.rs index 8756aec9..add05de4 100644 --- a/java_runtime/tests/classes/java/util/regex/test_pattern.rs +++ b/rustjava-runtime/tests/classes/java/util/regex/test_pattern.rs @@ -1,12 +1,12 @@ -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::{ +use jvm::{ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{ classes::java::{ lang::{CharSequence, String as JavaString}, util::regex::{Matcher, Pattern, PatternSyntaxException}, }, get_runtime_class_proto, }; -use jvm::{ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/util/regex/test_pattern_syntax_exception.rs b/rustjava-runtime/tests/classes/java/util/regex/test_pattern_syntax_exception.rs similarity index 98% rename from java_runtime/tests/classes/java/util/regex/test_pattern_syntax_exception.rs rename to rustjava-runtime/tests/classes/java/util/regex/test_pattern_syntax_exception.rs index 77b1fb5f..b7f6b417 100644 --- a/java_runtime/tests/classes/java/util/regex/test_pattern_syntax_exception.rs +++ b/rustjava-runtime/tests/classes/java/util/regex/test_pattern_syntax_exception.rs @@ -1,12 +1,12 @@ -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::{ +use jvm::{ClassInstanceRef, Result, runtime::JavaLangString}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{ classes::java::{ lang::{Object, String}, util::regex::PatternSyntaxException, }, get_runtime_class_proto, }; -use jvm::{ClassInstanceRef, Result, runtime::JavaLangString}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/util/regex/test_replacement.rs b/rustjava-runtime/tests/classes/java/util/regex/test_replacement.rs similarity index 99% rename from java_runtime/tests/classes/java/util/regex/test_replacement.rs rename to rustjava-runtime/tests/classes/java/util/regex/test_replacement.rs index 9681ec32..20806b25 100644 --- a/java_runtime/tests/classes/java/util/regex/test_replacement.rs +++ b/rustjava-runtime/tests/classes/java/util/regex/test_replacement.rs @@ -1,12 +1,12 @@ -use java_constants::MethodAccessFlags; -use java_runtime::{ +use jvm::{ClassInstanceRef, JavaError, Jvm, Result, runtime::JavaLangString}; +use jvm_types::MethodAccessFlags; +use rustjava_runtime::{ classes::java::{ lang::{CharSequence, String, StringBuffer}, util::regex::{Matcher, Pattern}, }, get_runtime_class_proto, }; -use jvm::{ClassInstanceRef, JavaError, Jvm, Result, runtime::JavaLangString}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/util/regex/test_split.rs b/rustjava-runtime/tests/classes/java/util/regex/test_split.rs similarity index 99% rename from java_runtime/tests/classes/java/util/regex/test_split.rs rename to rustjava-runtime/tests/classes/java/util/regex/test_split.rs index f7e67ca8..cdddc10f 100644 --- a/java_runtime/tests/classes/java/util/regex/test_split.rs +++ b/rustjava-runtime/tests/classes/java/util/regex/test_split.rs @@ -1,14 +1,14 @@ use alloc::{string::String as RustString, vec::Vec}; -use java_constants::MethodAccessFlags; -use java_runtime::{ +use jvm::{Array, ClassInstanceRef, JavaError, Jvm, Result, runtime::JavaLangString}; +use jvm_types::MethodAccessFlags; +use rustjava_runtime::{ classes::java::{ lang::{CharSequence, String}, util::regex::Pattern, }, get_runtime_class_proto, }; -use jvm::{Array, ClassInstanceRef, JavaError, Jvm, Result, runtime::JavaLangString}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/util/test_array_list.rs b/rustjava-runtime/tests/classes/java/util/test_array_list.rs similarity index 99% rename from java_runtime/tests/classes/java/util/test_array_list.rs rename to rustjava-runtime/tests/classes/java/util/test_array_list.rs index 57326625..409b2abb 100644 --- a/java_runtime/tests/classes/java/util/test_array_list.rs +++ b/rustjava-runtime/tests/classes/java/util/test_array_list.rs @@ -1,5 +1,5 @@ -use java_runtime::classes::java::lang::Object; use jvm::{Array, ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::lang::Object; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/util/test_arrays.rs b/rustjava-runtime/tests/classes/java/util/test_arrays.rs similarity index 99% rename from java_runtime/tests/classes/java/util/test_arrays.rs rename to rustjava-runtime/tests/classes/java/util/test_arrays.rs index aee46d93..2660622c 100644 --- a/java_runtime/tests/classes/java/util/test_arrays.rs +++ b/rustjava-runtime/tests/classes/java/util/test_arrays.rs @@ -1,10 +1,10 @@ use alloc::{boxed::Box, collections::BTreeMap, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, Jvm, Result, runtime::JavaLangString}; -use jvm_rust::ClassDefinitionImpl; +use jvm_bytecode::ClassDefinitionImpl; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object}; use test_utils::{TestRuntime, create_test_jvm, test_jvm}; diff --git a/java_runtime/tests/classes/java/util/test_collection_contracts.rs b/rustjava-runtime/tests/classes/java/util/test_collection_contracts.rs similarity index 99% rename from java_runtime/tests/classes/java/util/test_collection_contracts.rs rename to rustjava-runtime/tests/classes/java/util/test_collection_contracts.rs index b52ee978..56cfd416 100644 --- a/java_runtime/tests/classes/java/util/test_collection_contracts.rs +++ b/rustjava-runtime/tests/classes/java/util/test_collection_contracts.rs @@ -1,10 +1,10 @@ use alloc::{boxed::Box, collections::BTreeMap, vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object, get_runtime_class_proto}; use jvm::{Array, ClassInstanceRef, JavaError, Jvm, Result, runtime::JavaLangString}; -use jvm_rust::ClassDefinitionImpl; +use jvm_bytecode::ClassDefinitionImpl; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object, get_runtime_class_proto}; use test_utils::{TestRuntime, create_test_jvm, test_jvm}; diff --git a/java_runtime/tests/classes/java/util/test_collections.rs b/rustjava-runtime/tests/classes/java/util/test_collections.rs similarity index 99% rename from java_runtime/tests/classes/java/util/test_collections.rs rename to rustjava-runtime/tests/classes/java/util/test_collections.rs index 220a131e..632c7fa6 100644 --- a/java_runtime/tests/classes/java/util/test_collections.rs +++ b/rustjava-runtime/tests/classes/java/util/test_collections.rs @@ -1,10 +1,10 @@ use alloc::{boxed::Box, collections::BTreeMap, vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object, get_runtime_class_proto}; use jvm::{Array, ClassInstanceRef, JavaError, Jvm, Result, runtime::JavaLangString}; -use jvm_rust::ClassDefinitionImpl; +use jvm_bytecode::ClassDefinitionImpl; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object, get_runtime_class_proto}; use test_utils::{TestRuntime, create_test_jvm, test_jvm}; diff --git a/java_runtime/tests/classes/java/util/test_date.rs b/rustjava-runtime/tests/classes/java/util/test_date.rs similarity index 99% rename from java_runtime/tests/classes/java/util/test_date.rs rename to rustjava-runtime/tests/classes/java/util/test_date.rs index e274f4a4..158c5495 100644 --- a/java_runtime/tests/classes/java/util/test_date.rs +++ b/rustjava-runtime/tests/classes/java/util/test_date.rs @@ -1,5 +1,5 @@ -use java_runtime::classes::java::lang::Object; use jvm::{ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::lang::Object; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/util/test_formatter.rs b/rustjava-runtime/tests/classes/java/util/test_formatter.rs similarity index 99% rename from java_runtime/tests/classes/java/util/test_formatter.rs rename to rustjava-runtime/tests/classes/java/util/test_formatter.rs index 2ef74d53..0369be3b 100644 --- a/java_runtime/tests/classes/java/util/test_formatter.rs +++ b/rustjava-runtime/tests/classes/java/util/test_formatter.rs @@ -1,5 +1,6 @@ -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::{ +use jvm::{Array, ClassInstanceRef, JavaError, JavaValue, Result, runtime::JavaLangString}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{ classes::java::{ io::{File, OutputStream, PrintStream}, lang::{Appendable, Class as JavaClass, Object, String as JavaString}, @@ -7,7 +8,6 @@ use java_runtime::{ }, get_runtime_class_proto, }; -use jvm::{Array, ClassInstanceRef, JavaError, JavaValue, Result, runtime::JavaLangString}; use test_utils::test_jvm; #[test] diff --git a/java_runtime/tests/classes/java/util/test_gregorian_calendar.rs b/rustjava-runtime/tests/classes/java/util/test_gregorian_calendar.rs similarity index 99% rename from java_runtime/tests/classes/java/util/test_gregorian_calendar.rs rename to rustjava-runtime/tests/classes/java/util/test_gregorian_calendar.rs index 409b502f..bbba412d 100644 --- a/java_runtime/tests/classes/java/util/test_gregorian_calendar.rs +++ b/rustjava-runtime/tests/classes/java/util/test_gregorian_calendar.rs @@ -1,5 +1,5 @@ -use java_runtime::classes::java::lang::Object; use jvm::{ClassInstanceRef, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::lang::Object; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/util/test_hash_map.rs b/rustjava-runtime/tests/classes/java/util/test_hash_map.rs similarity index 99% rename from java_runtime/tests/classes/java/util/test_hash_map.rs rename to rustjava-runtime/tests/classes/java/util/test_hash_map.rs index c44e15a1..d803af61 100644 --- a/java_runtime/tests/classes/java/util/test_hash_map.rs +++ b/rustjava-runtime/tests/classes/java/util/test_hash_map.rs @@ -1,10 +1,10 @@ use alloc::{boxed::Box, collections::BTreeMap, vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object, classes::java::util::HashMapEntry}; use jvm::{Array, ClassInstanceRef, JavaError, Jvm, Result, runtime::JavaLangString}; -use jvm_rust::ClassDefinitionImpl; +use jvm_bytecode::ClassDefinitionImpl; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object, classes::java::util::HashMapEntry}; use test_utils::{TestRuntime, create_test_jvm, test_jvm}; diff --git a/java_runtime/tests/classes/java/util/test_hash_set.rs b/rustjava-runtime/tests/classes/java/util/test_hash_set.rs similarity index 99% rename from java_runtime/tests/classes/java/util/test_hash_set.rs rename to rustjava-runtime/tests/classes/java/util/test_hash_set.rs index bb2c7077..ef82eaf3 100644 --- a/java_runtime/tests/classes/java/util/test_hash_set.rs +++ b/rustjava-runtime/tests/classes/java/util/test_hash_set.rs @@ -1,5 +1,5 @@ -use java_runtime::classes::java::{lang::Object, util::HashMapEntry}; use jvm::{Array, ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::{lang::Object, util::HashMapEntry}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/util/test_hashtable.rs b/rustjava-runtime/tests/classes/java/util/test_hashtable.rs similarity index 99% rename from java_runtime/tests/classes/java/util/test_hashtable.rs rename to rustjava-runtime/tests/classes/java/util/test_hashtable.rs index 8bdafcbe..1e3f8553 100644 --- a/java_runtime/tests/classes/java/util/test_hashtable.rs +++ b/rustjava-runtime/tests/classes/java/util/test_hashtable.rs @@ -1,7 +1,7 @@ use alloc::{vec, vec::Vec}; -use java_runtime::classes::java::lang::Object; use jvm::{ClassInstanceRef, JavaError, Jvm, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::lang::Object; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/util/test_linked_hash_map.rs b/rustjava-runtime/tests/classes/java/util/test_linked_hash_map.rs similarity index 98% rename from java_runtime/tests/classes/java/util/test_linked_hash_map.rs rename to rustjava-runtime/tests/classes/java/util/test_linked_hash_map.rs index bcbe7595..3e6313e6 100644 --- a/java_runtime/tests/classes/java/util/test_linked_hash_map.rs +++ b/rustjava-runtime/tests/classes/java/util/test_linked_hash_map.rs @@ -1,10 +1,10 @@ use alloc::{boxed::Box, collections::BTreeMap, vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object, get_runtime_class_proto}; use jvm::{Array, ClassInstanceRef, JavaError, Jvm, Result, runtime::JavaLangString}; -use jvm_rust::ClassDefinitionImpl; +use jvm_bytecode::ClassDefinitionImpl; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{RuntimeClassProto, RuntimeContext, classes::java::lang::Object, get_runtime_class_proto}; use test_utils::{TestRuntime, create_test_jvm, test_jvm}; diff --git a/java_runtime/tests/classes/java/util/test_list_views.rs b/rustjava-runtime/tests/classes/java/util/test_list_views.rs similarity index 99% rename from java_runtime/tests/classes/java/util/test_list_views.rs rename to rustjava-runtime/tests/classes/java/util/test_list_views.rs index b9468239..a2832b53 100644 --- a/java_runtime/tests/classes/java/util/test_list_views.rs +++ b/rustjava-runtime/tests/classes/java/util/test_list_views.rs @@ -1,6 +1,6 @@ -use java_constants::{ClassAccessFlags, MethodAccessFlags}; -use java_runtime::{classes::java::lang::Object, get_runtime_class_proto}; use jvm::{Array, ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{classes::java::lang::Object, get_runtime_class_proto}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/util/test_locale.rs b/rustjava-runtime/tests/classes/java/util/test_locale.rs similarity index 99% rename from java_runtime/tests/classes/java/util/test_locale.rs rename to rustjava-runtime/tests/classes/java/util/test_locale.rs index fae03076..9340ebfb 100644 --- a/java_runtime/tests/classes/java/util/test_locale.rs +++ b/rustjava-runtime/tests/classes/java/util/test_locale.rs @@ -1,5 +1,5 @@ -use java_runtime::classes::java::{lang::String, util::Locale}; use jvm::{Array, ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::{lang::String, util::Locale}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/util/test_properties.rs b/rustjava-runtime/tests/classes/java/util/test_properties.rs similarity index 99% rename from java_runtime/tests/classes/java/util/test_properties.rs rename to rustjava-runtime/tests/classes/java/util/test_properties.rs index b82b5d2b..97860608 100644 --- a/java_runtime/tests/classes/java/util/test_properties.rs +++ b/rustjava-runtime/tests/classes/java/util/test_properties.rs @@ -1,8 +1,10 @@ use alloc::{boxed::Box, collections::BTreeMap, string::String as RustString, vec, vec::Vec}; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::{ +use jvm::{Array, ClassInstanceRef, JavaError, Jvm, Result, runtime::JavaLangString}; +use jvm_bytecode::ClassDefinitionImpl; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{ RuntimeClassProto, RuntimeContext, classes::java::{ io::{InputStream, OutputStream}, @@ -10,8 +12,6 @@ use java_runtime::{ util::Properties, }, }; -use jvm::{Array, ClassInstanceRef, JavaError, Jvm, Result, runtime::JavaLangString}; -use jvm_rust::ClassDefinitionImpl; use test_utils::{TestRuntime, create_test_jvm, test_jvm}; diff --git a/java_runtime/tests/classes/java/util/test_random.rs b/rustjava-runtime/tests/classes/java/util/test_random.rs similarity index 98% rename from java_runtime/tests/classes/java/util/test_random.rs rename to rustjava-runtime/tests/classes/java/util/test_random.rs index b39ee012..cf29e434 100644 --- a/java_runtime/tests/classes/java/util/test_random.rs +++ b/rustjava-runtime/tests/classes/java/util/test_random.rs @@ -1,6 +1,6 @@ -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::classes::java::util::Random; use jvm::{Array, ClassInstanceRef, JavaError, Result}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::classes::java::util::Random; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/util/test_stack.rs b/rustjava-runtime/tests/classes/java/util/test_stack.rs similarity index 99% rename from java_runtime/tests/classes/java/util/test_stack.rs rename to rustjava-runtime/tests/classes/java/util/test_stack.rs index 1ff13fef..4ed913fa 100644 --- a/java_runtime/tests/classes/java/util/test_stack.rs +++ b/rustjava-runtime/tests/classes/java/util/test_stack.rs @@ -1,5 +1,5 @@ -use java_runtime::classes::java::lang::Object; use jvm::{ClassInstanceRef, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::lang::Object; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/util/test_string_tokenizer.rs b/rustjava-runtime/tests/classes/java/util/test_string_tokenizer.rs similarity index 99% rename from java_runtime/tests/classes/java/util/test_string_tokenizer.rs rename to rustjava-runtime/tests/classes/java/util/test_string_tokenizer.rs index a5cd0579..58c03977 100644 --- a/java_runtime/tests/classes/java/util/test_string_tokenizer.rs +++ b/rustjava-runtime/tests/classes/java/util/test_string_tokenizer.rs @@ -1,11 +1,11 @@ use alloc::vec::Vec; -use java_constants::{ClassAccessFlags, MethodAccessFlags}; -use java_runtime::classes::java::{ +use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, Result, runtime::JavaLangString}; +use jvm_types::{ClassAccessFlags, MethodAccessFlags}; +use rustjava_runtime::classes::java::{ lang::{Object, String}, util::StringTokenizer, }; -use jvm::{Array, ClassInstanceRef, JavaChar, JavaError, Result, runtime::JavaLangString}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/util/test_timer.rs b/rustjava-runtime/tests/classes/java/util/test_timer.rs similarity index 99% rename from java_runtime/tests/classes/java/util/test_timer.rs rename to rustjava-runtime/tests/classes/java/util/test_timer.rs index e00cdb0d..48a13b17 100644 --- a/java_runtime/tests/classes/java/util/test_timer.rs +++ b/rustjava-runtime/tests/classes/java/util/test_timer.rs @@ -1,14 +1,14 @@ use alloc::{boxed::Box, collections::BTreeMap, vec, vec::Vec}; use core::time::Duration; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::{ +use jvm::{ClassInstanceRef, JavaError, Jvm, MonitorWait, Result}; +use jvm_bytecode::ClassDefinitionImpl; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{ RuntimeClassProto, RuntimeContext, classes::java::util::{Date, Timer, TimerTask, TimerTaskQueue, TimerThread}, }; -use jvm::{ClassInstanceRef, JavaError, Jvm, MonitorWait, Result}; -use jvm_rust::ClassDefinitionImpl; use test_utils::{TestRuntime, create_test_jvm}; diff --git a/java_runtime/tests/classes/java/util/test_timezone.rs b/rustjava-runtime/tests/classes/java/util/test_timezone.rs similarity index 94% rename from java_runtime/tests/classes/java/util/test_timezone.rs rename to rustjava-runtime/tests/classes/java/util/test_timezone.rs index 18119c6c..ef512df5 100644 --- a/java_runtime/tests/classes/java/util/test_timezone.rs +++ b/rustjava-runtime/tests/classes/java/util/test_timezone.rs @@ -1,9 +1,9 @@ -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::classes::java::{ +use jvm::{Array, ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::classes::java::{ lang::String, util::{SimpleTimeZone, TimeZone}, }; -use jvm::{Array, ClassInstanceRef, JavaError, Result, runtime::JavaLangString}; use test_utils::test_jvm; @@ -18,7 +18,7 @@ async fn test_timezone() -> Result<()> { assert!(!timezone.is_null()); - let id: ClassInstanceRef = jvm + let id: ClassInstanceRef = jvm .invoke_virtual(&timezone, "java/util/TimeZone", "getID", "()Ljava/lang/String;", ()) .await?; assert_eq!(JavaLangString::to_rust_string(&jvm, &id).await?, "UTC"); @@ -35,16 +35,16 @@ async fn test_timezone() -> Result<()> { let default: ClassInstanceRef = jvm .invoke_static("java/util/TimeZone", "getDefault", "()Ljava/util/TimeZone;", ()) .await?; - let id: ClassInstanceRef = jvm + let id: ClassInstanceRef = jvm .invoke_virtual(&default, "java/util/TimeZone", "getID", "()Ljava/lang/String;", ()) .await?; assert_eq!(JavaLangString::to_rust_string(&jvm, &id).await?, "GMT"); - let ids: ClassInstanceRef> = jvm + let ids: ClassInstanceRef> = jvm .invoke_static("java/util/TimeZone", "getAvailableIDs", "()[Ljava/lang/String;", ()) .await?; let ids = jvm - .load_array::>(&ids, 0, jvm.array_length(&ids).await?) + .load_array::>(&ids, 0, jvm.array_length(&ids).await?) .await?; let mut rust_ids = alloc::vec::Vec::new(); for id in ids { @@ -61,7 +61,7 @@ async fn test_timezone() -> Result<()> { (unknown,), ) .await?; - let id: ClassInstanceRef = jvm + let id: ClassInstanceRef = jvm .invoke_virtual(&fallback, "java/util/TimeZone", "getID", "()Ljava/lang/String;", ()) .await?; assert_eq!(JavaLangString::to_rust_string(&jvm, &id).await?, "GMT"); @@ -289,7 +289,7 @@ async fn tz_02_to_04_id_abstract_contract_and_simple_timezone_mutation() -> Resu .await? ); - let null_date: ClassInstanceRef = None.into(); + let null_date: ClassInstanceRef = None.into(); let result: Result = jvm .invoke_virtual(&timezone, "java/util/TimeZone", "inDaylightTime", "(Ljava/util/Date;)Z", (null_date,)) .await; diff --git a/java_runtime/tests/classes/java/util/test_tree_map.rs b/rustjava-runtime/tests/classes/java/util/test_tree_map.rs similarity index 99% rename from java_runtime/tests/classes/java/util/test_tree_map.rs rename to rustjava-runtime/tests/classes/java/util/test_tree_map.rs index 107312e1..cc1593b8 100644 --- a/java_runtime/tests/classes/java/util/test_tree_map.rs +++ b/rustjava-runtime/tests/classes/java/util/test_tree_map.rs @@ -5,15 +5,15 @@ use alloc::{ vec::Vec, }; -use java_class_proto::{JavaFieldProto, JavaMethodProto}; -use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; -use java_runtime::{ +use jvm::{Array, ClassInstanceRef, JavaError, Jvm, Result}; +use jvm_bytecode::ClassDefinitionImpl; +use jvm_class_proto::{JavaFieldProto, JavaMethodProto}; +use jvm_types::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags}; +use rustjava_runtime::{ RuntimeClassProto, RuntimeContext, classes::java::{lang::Object, util::TreeMapEntry}, get_runtime_class_proto, }; -use jvm::{Array, ClassInstanceRef, JavaError, Jvm, Result}; -use jvm_rust::ClassDefinitionImpl; use test_utils::{TestRuntime, create_test_jvm}; diff --git a/java_runtime/tests/classes/java/util/test_url.rs b/rustjava-runtime/tests/classes/java/util/test_url.rs similarity index 100% rename from java_runtime/tests/classes/java/util/test_url.rs rename to rustjava-runtime/tests/classes/java/util/test_url.rs diff --git a/java_runtime/tests/classes/java/util/test_vector.rs b/rustjava-runtime/tests/classes/java/util/test_vector.rs similarity index 99% rename from java_runtime/tests/classes/java/util/test_vector.rs rename to rustjava-runtime/tests/classes/java/util/test_vector.rs index 7d386426..57e0b0a8 100644 --- a/java_runtime/tests/classes/java/util/test_vector.rs +++ b/rustjava-runtime/tests/classes/java/util/test_vector.rs @@ -1,5 +1,5 @@ -use java_runtime::classes::java::lang::Object; use jvm::{Array, ClassInstanceRef, JavaError, JavaValue, Jvm, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::lang::Object; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/java/util/zip/mod.rs b/rustjava-runtime/tests/classes/java/util/zip/mod.rs similarity index 100% rename from java_runtime/tests/classes/java/util/zip/mod.rs rename to rustjava-runtime/tests/classes/java/util/zip/mod.rs diff --git a/java_runtime/tests/classes/java/util/zip/test_zip_file.rs b/rustjava-runtime/tests/classes/java/util/zip/test_zip_file.rs similarity index 96% rename from java_runtime/tests/classes/java/util/zip/test_zip_file.rs rename to rustjava-runtime/tests/classes/java/util/zip/test_zip_file.rs index bb7b5cff..07367403 100644 --- a/java_runtime/tests/classes/java/util/zip/test_zip_file.rs +++ b/rustjava-runtime/tests/classes/java/util/zip/test_zip_file.rs @@ -6,7 +6,7 @@ use test_utils::test_jvm_filesystem; #[tokio::test] async fn test_zip_entry() -> Result<()> { - let jar = include_bytes!("../../../../../../test_data/test.jar"); + let jar = include_bytes!("../../../../../../test-data/test.jar"); let filesystem = [("test.jar".into(), jar.to_vec())].into_iter().collect(); let jvm = test_jvm_filesystem(filesystem).await?; diff --git a/java_runtime/tests/classes/mod.rs b/rustjava-runtime/tests/classes/mod.rs similarity index 100% rename from java_runtime/tests/classes/mod.rs rename to rustjava-runtime/tests/classes/mod.rs diff --git a/java_runtime/tests/classes/org/mod.rs b/rustjava-runtime/tests/classes/org/mod.rs similarity index 100% rename from java_runtime/tests/classes/org/mod.rs rename to rustjava-runtime/tests/classes/org/mod.rs diff --git a/java_runtime/tests/classes/org/rustjava/lang/mod.rs b/rustjava-runtime/tests/classes/org/rustjava/lang/mod.rs similarity index 100% rename from java_runtime/tests/classes/org/rustjava/lang/mod.rs rename to rustjava-runtime/tests/classes/org/rustjava/lang/mod.rs diff --git a/java_runtime/tests/classes/org/rustjava/lang/test_rust_jar_class_loader.rs b/rustjava-runtime/tests/classes/org/rustjava/lang/test_rust_jar_class_loader.rs similarity index 97% rename from java_runtime/tests/classes/org/rustjava/lang/test_rust_jar_class_loader.rs rename to rustjava-runtime/tests/classes/org/rustjava/lang/test_rust_jar_class_loader.rs index 607416bf..4263c9cb 100644 --- a/java_runtime/tests/classes/org/rustjava/lang/test_rust_jar_class_loader.rs +++ b/rustjava-runtime/tests/classes/org/rustjava/lang/test_rust_jar_class_loader.rs @@ -1,10 +1,10 @@ use alloc::vec; -use java_runtime::classes::{ +use jvm::{ClassInstanceRef, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::{ java::lang::{Class, ClassLoader}, org::rustjava::lang::RustJarClassLoader, }; -use jvm::{ClassInstanceRef, Result, runtime::JavaLangString}; use test_utils::test_jvm; diff --git a/java_runtime/tests/classes/org/rustjava/mod.rs b/rustjava-runtime/tests/classes/org/rustjava/mod.rs similarity index 100% rename from java_runtime/tests/classes/org/rustjava/mod.rs rename to rustjava-runtime/tests/classes/org/rustjava/mod.rs diff --git a/java_runtime/tests/classes/org/rustjava/net/mod.rs b/rustjava-runtime/tests/classes/org/rustjava/net/mod.rs similarity index 100% rename from java_runtime/tests/classes/org/rustjava/net/mod.rs rename to rustjava-runtime/tests/classes/org/rustjava/net/mod.rs diff --git a/java_runtime/tests/classes/org/rustjava/net/test_file_url_connection.rs b/rustjava-runtime/tests/classes/org/rustjava/net/test_file_url_connection.rs similarity index 100% rename from java_runtime/tests/classes/org/rustjava/net/test_file_url_connection.rs rename to rustjava-runtime/tests/classes/org/rustjava/net/test_file_url_connection.rs diff --git a/java_runtime/tests/classes/org/rustjava/net/test_jar_url_connection.rs b/rustjava-runtime/tests/classes/org/rustjava/net/test_jar_url_connection.rs similarity index 93% rename from java_runtime/tests/classes/org/rustjava/net/test_jar_url_connection.rs rename to rustjava-runtime/tests/classes/org/rustjava/net/test_jar_url_connection.rs index 54fb4b3d..8bf86026 100644 --- a/java_runtime/tests/classes/org/rustjava/net/test_jar_url_connection.rs +++ b/rustjava-runtime/tests/classes/org/rustjava/net/test_jar_url_connection.rs @@ -1,13 +1,13 @@ use alloc::vec; -use java_runtime::classes::java::util::jar::JarFile; use jvm::{ClassInstanceRef, Result, runtime::JavaLangString}; +use rustjava_runtime::classes::java::util::jar::JarFile; use test_utils::test_jvm_filesystem; #[tokio::test] async fn test_jar_entry() -> Result<()> { - let jar = include_bytes!("../../../../../../test_data/test.jar"); + let jar = include_bytes!("../../../../../../test-data/test.jar"); let filesystem = [("test.jar".into(), jar.to_vec())].into_iter().collect(); let jvm = test_jvm_filesystem(filesystem).await?; @@ -43,7 +43,7 @@ async fn test_jar_entry() -> Result<()> { #[tokio::test] async fn test_jar_file() -> Result<()> { - let jar = include_bytes!("../../../../../../test_data/test.jar"); + let jar = include_bytes!("../../../../../../test-data/test.jar"); let filesystem = [("test.jar".into(), jar.to_vec())].into_iter().collect(); let jvm = test_jvm_filesystem(filesystem).await?; @@ -82,7 +82,7 @@ async fn test_jar_file() -> Result<()> { #[tokio::test] async fn test_jar_cache() -> Result<()> { - let jar = include_bytes!("../../../../../../test_data/test.jar"); + let jar = include_bytes!("../../../../../../test-data/test.jar"); let filesystem = [("test.jar".into(), jar.to_vec())].into_iter().collect(); let jvm = test_jvm_filesystem(filesystem).await?; diff --git a/java_runtime/tests/tests.rs b/rustjava-runtime/tests/tests.rs similarity index 100% rename from java_runtime/tests/tests.rs rename to rustjava-runtime/tests/tests.rs diff --git a/src/lib.rs b/src/lib.rs index db8fed99..bc359f5d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,8 +4,8 @@ mod runtime; use std::{env, io::Write, path::Path}; -use java_runtime::{Runtime, get_bootstrap_class_loader}; use jvm::{JavaError, JavaValue, Jvm, Result, runtime::JavaLangString}; +use rustjava_runtime::{Runtime, get_bootstrap_class_loader}; use runtime::RuntimeImpl; diff --git a/src/runtime.rs b/src/runtime.rs index c8be2697..b9494193 100644 --- a/src/runtime.rs +++ b/src/runtime.rs @@ -12,11 +12,11 @@ use std::{ time::{SystemTime, UNIX_EPOCH}, }; -use java_runtime::{ +use jvm::{ClassDefinition, Jvm}; +use jvm_bytecode::{ArrayClassDefinitionImpl, ClassDefinitionError, ClassDefinitionImpl}; +use rustjava_runtime::{ File, FileDescriptorId, FileOpenOptions, FileStat, FileType, IOError, IOResult, RT_RUSTJAR, Runtime, SpawnCallback, get_runtime_class_proto, }; -use jvm::{ClassDefinition, Jvm}; -use jvm_rust::{ArrayClassDefinitionImpl, ClassDefinitionError, ClassDefinitionImpl}; use self::io::{FileImpl, InputStreamFile, WriteStreamFile}; diff --git a/src/runtime/io.rs b/src/runtime/io.rs index c773c5cc..8ee65db6 100644 --- a/src/runtime/io.rs +++ b/src/runtime/io.rs @@ -5,7 +5,7 @@ use std::{ sync::Mutex, }; -use java_runtime::{File, FileOpenOptions, FileSize, FileStat, FileType, IOError, IOResult}; +use rustjava_runtime::{File, FileOpenOptions, FileSize, FileStat, FileType, IOError, IOResult}; pub struct WriteStreamFile where diff --git a/test_data/Abstract$Base.class b/test-data/Abstract$Base.class similarity index 100% rename from test_data/Abstract$Base.class rename to test-data/Abstract$Base.class diff --git a/test_data/Abstract$Derived.class b/test-data/Abstract$Derived.class similarity index 100% rename from test_data/Abstract$Derived.class rename to test-data/Abstract$Derived.class diff --git a/test_data/Abstract.class b/test-data/Abstract.class similarity index 100% rename from test_data/Abstract.class rename to test-data/Abstract.class diff --git a/test_data/Abstract.txt b/test-data/Abstract.txt similarity index 100% rename from test_data/Abstract.txt rename to test-data/Abstract.txt diff --git a/test_data/Array.class b/test-data/Array.class similarity index 100% rename from test_data/Array.class rename to test-data/Array.class diff --git a/test_data/Array.txt b/test-data/Array.txt similarity index 100% rename from test_data/Array.txt rename to test-data/Array.txt diff --git a/test_data/ArrayCovariance.class b/test-data/ArrayCovariance.class similarity index 100% rename from test_data/ArrayCovariance.class rename to test-data/ArrayCovariance.class diff --git a/test_data/ArrayCovariance.txt b/test-data/ArrayCovariance.txt similarity index 100% rename from test_data/ArrayCovariance.txt rename to test-data/ArrayCovariance.txt diff --git a/test_data/ArrayEdgeCases.class b/test-data/ArrayEdgeCases.class similarity index 100% rename from test_data/ArrayEdgeCases.class rename to test-data/ArrayEdgeCases.class diff --git a/test_data/ArrayEdgeCases.txt b/test-data/ArrayEdgeCases.txt similarity index 100% rename from test_data/ArrayEdgeCases.txt rename to test-data/ArrayEdgeCases.txt diff --git a/test_data/ArrayStore.class b/test-data/ArrayStore.class similarity index 100% rename from test_data/ArrayStore.class rename to test-data/ArrayStore.class diff --git a/test_data/ArrayStore.txt b/test-data/ArrayStore.txt similarity index 100% rename from test_data/ArrayStore.txt rename to test-data/ArrayStore.txt diff --git a/test_data/BooleanTest.class b/test-data/BooleanTest.class similarity index 100% rename from test_data/BooleanTest.class rename to test-data/BooleanTest.class diff --git a/test_data/BooleanTest.txt b/test-data/BooleanTest.txt similarity index 100% rename from test_data/BooleanTest.txt rename to test-data/BooleanTest.txt diff --git a/test_data/CheckCast.class b/test-data/CheckCast.class similarity index 100% rename from test_data/CheckCast.class rename to test-data/CheckCast.class diff --git a/test_data/CheckCast.txt b/test-data/CheckCast.txt similarity index 100% rename from test_data/CheckCast.txt rename to test-data/CheckCast.txt diff --git a/test_data/ClassMetadata$ByteLoader.class b/test-data/ClassMetadata$ByteLoader.class similarity index 100% rename from test_data/ClassMetadata$ByteLoader.class rename to test-data/ClassMetadata$ByteLoader.class diff --git a/test_data/ClassMetadata$First.class b/test-data/ClassMetadata$First.class similarity index 100% rename from test_data/ClassMetadata$First.class rename to test-data/ClassMetadata$First.class diff --git a/test_data/ClassMetadata$Payload.class b/test-data/ClassMetadata$Payload.class similarity index 100% rename from test_data/ClassMetadata$Payload.class rename to test-data/ClassMetadata$Payload.class diff --git a/test_data/ClassMetadata$Sample.class b/test-data/ClassMetadata$Sample.class similarity index 100% rename from test_data/ClassMetadata$Sample.class rename to test-data/ClassMetadata$Sample.class diff --git a/test_data/ClassMetadata$Second.class b/test-data/ClassMetadata$Second.class similarity index 100% rename from test_data/ClassMetadata$Second.class rename to test-data/ClassMetadata$Second.class diff --git a/test_data/ClassMetadata.class b/test-data/ClassMetadata.class similarity index 100% rename from test_data/ClassMetadata.class rename to test-data/ClassMetadata.class diff --git a/test_data/ClassMetadata.txt b/test-data/ClassMetadata.txt similarity index 100% rename from test_data/ClassMetadata.txt rename to test-data/ClassMetadata.txt diff --git a/test_data/ClinitFailure$Bad.class b/test-data/ClinitFailure$Bad.class similarity index 100% rename from test_data/ClinitFailure$Bad.class rename to test-data/ClinitFailure$Bad.class diff --git a/test_data/ClinitFailure$BadError.class b/test-data/ClinitFailure$BadError.class similarity index 100% rename from test_data/ClinitFailure$BadError.class rename to test-data/ClinitFailure$BadError.class diff --git a/test_data/ClinitFailure.class b/test-data/ClinitFailure.class similarity index 100% rename from test_data/ClinitFailure.class rename to test-data/ClinitFailure.class diff --git a/test_data/ClinitFailure.txt b/test-data/ClinitFailure.txt similarity index 100% rename from test_data/ClinitFailure.txt rename to test-data/ClinitFailure.txt diff --git a/test_data/CollectionsInvokeInterface.class b/test-data/CollectionsInvokeInterface.class similarity index 100% rename from test_data/CollectionsInvokeInterface.class rename to test-data/CollectionsInvokeInterface.class diff --git a/test_data/CollectionsInvokeInterface.txt b/test-data/CollectionsInvokeInterface.txt similarity index 100% rename from test_data/CollectionsInvokeInterface.txt rename to test-data/CollectionsInvokeInterface.txt diff --git a/test_data/ConcurrentClinit$Failing.class b/test-data/ConcurrentClinit$Failing.class similarity index 100% rename from test_data/ConcurrentClinit$Failing.class rename to test-data/ConcurrentClinit$Failing.class diff --git a/test_data/ConcurrentClinit$FailingReader.class b/test-data/ConcurrentClinit$FailingReader.class similarity index 100% rename from test_data/ConcurrentClinit$FailingReader.class rename to test-data/ConcurrentClinit$FailingReader.class diff --git a/test_data/ConcurrentClinit$Successful.class b/test-data/ConcurrentClinit$Successful.class similarity index 100% rename from test_data/ConcurrentClinit$Successful.class rename to test-data/ConcurrentClinit$Successful.class diff --git a/test_data/ConcurrentClinit$SuccessfulReader.class b/test-data/ConcurrentClinit$SuccessfulReader.class similarity index 100% rename from test_data/ConcurrentClinit$SuccessfulReader.class rename to test-data/ConcurrentClinit$SuccessfulReader.class diff --git a/test_data/ConcurrentClinit.class b/test-data/ConcurrentClinit.class similarity index 100% rename from test_data/ConcurrentClinit.class rename to test-data/ConcurrentClinit.class diff --git a/test_data/ConcurrentClinit.txt b/test-data/ConcurrentClinit.txt similarity index 100% rename from test_data/ConcurrentClinit.txt rename to test-data/ConcurrentClinit.txt diff --git a/test_data/Constants.class b/test-data/Constants.class similarity index 100% rename from test_data/Constants.class rename to test-data/Constants.class diff --git a/test_data/Constants.txt b/test-data/Constants.txt similarity index 100% rename from test_data/Constants.txt rename to test-data/Constants.txt diff --git a/test_data/ConstantsReader.class b/test-data/ConstantsReader.class similarity index 100% rename from test_data/ConstantsReader.class rename to test-data/ConstantsReader.class diff --git a/test_data/ConstantsReader.txt b/test-data/ConstantsReader.txt similarity index 100% rename from test_data/ConstantsReader.txt rename to test-data/ConstantsReader.txt diff --git a/test_data/ControlFlow.class b/test-data/ControlFlow.class similarity index 100% rename from test_data/ControlFlow.class rename to test-data/ControlFlow.class diff --git a/test_data/ControlFlow.txt b/test-data/ControlFlow.txt similarity index 100% rename from test_data/ControlFlow.txt rename to test-data/ControlFlow.txt diff --git a/test_data/CurrentThread$1.class b/test-data/CurrentThread$1.class similarity index 100% rename from test_data/CurrentThread$1.class rename to test-data/CurrentThread$1.class diff --git a/test_data/CurrentThread.class b/test-data/CurrentThread.class similarity index 100% rename from test_data/CurrentThread.class rename to test-data/CurrentThread.class diff --git a/test_data/CurrentThread.txt b/test-data/CurrentThread.txt similarity index 100% rename from test_data/CurrentThread.txt rename to test-data/CurrentThread.txt diff --git a/test_data/DoubleInit.class b/test-data/DoubleInit.class similarity index 100% rename from test_data/DoubleInit.class rename to test-data/DoubleInit.class diff --git a/test_data/DoubleInit.txt b/test-data/DoubleInit.txt similarity index 100% rename from test_data/DoubleInit.txt rename to test-data/DoubleInit.txt diff --git a/test_data/Dup.class b/test-data/Dup.class similarity index 100% rename from test_data/Dup.class rename to test-data/Dup.class diff --git a/test_data/Dup.txt b/test-data/Dup.txt similarity index 100% rename from test_data/Dup.txt rename to test-data/Dup.txt diff --git a/test_data/Exception.class b/test-data/Exception.class similarity index 100% rename from test_data/Exception.class rename to test-data/Exception.class diff --git a/test_data/Exception.txt b/test-data/Exception.txt similarity index 100% rename from test_data/Exception.txt rename to test-data/Exception.txt diff --git a/test_data/Field.class b/test-data/Field.class similarity index 100% rename from test_data/Field.class rename to test-data/Field.class diff --git a/test_data/Field.txt b/test-data/Field.txt similarity index 100% rename from test_data/Field.txt rename to test-data/Field.txt diff --git a/test_data/FieldTypes.class b/test-data/FieldTypes.class similarity index 100% rename from test_data/FieldTypes.class rename to test-data/FieldTypes.class diff --git a/test_data/FieldTypes.txt b/test-data/FieldTypes.txt similarity index 100% rename from test_data/FieldTypes.txt rename to test-data/FieldTypes.txt diff --git a/test_data/FileErrors.class b/test-data/FileErrors.class similarity index 100% rename from test_data/FileErrors.class rename to test-data/FileErrors.class diff --git a/test_data/FileErrors.txt b/test-data/FileErrors.txt similarity index 100% rename from test_data/FileErrors.txt rename to test-data/FileErrors.txt diff --git a/test_data/FileLength.class b/test-data/FileLength.class similarity index 100% rename from test_data/FileLength.class rename to test-data/FileLength.class diff --git a/test_data/FileLength.txt b/test-data/FileLength.txt similarity index 100% rename from test_data/FileLength.txt rename to test-data/FileLength.txt diff --git a/test_data/ForName.class b/test-data/ForName.class similarity index 100% rename from test_data/ForName.class rename to test-data/ForName.class diff --git a/test_data/ForName.txt b/test-data/ForName.txt similarity index 100% rename from test_data/ForName.txt rename to test-data/ForName.txt diff --git a/test_data/FormatterIntegration$1.class b/test-data/FormatterIntegration$1.class similarity index 100% rename from test_data/FormatterIntegration$1.class rename to test-data/FormatterIntegration$1.class diff --git a/test_data/FormatterIntegration$FailingAppendable.class b/test-data/FormatterIntegration$FailingAppendable.class similarity index 100% rename from test_data/FormatterIntegration$FailingAppendable.class rename to test-data/FormatterIntegration$FailingAppendable.class diff --git a/test_data/FormatterIntegration$SnapshotSequence.class b/test-data/FormatterIntegration$SnapshotSequence.class similarity index 100% rename from test_data/FormatterIntegration$SnapshotSequence.class rename to test-data/FormatterIntegration$SnapshotSequence.class diff --git a/test_data/FormatterIntegration.class b/test-data/FormatterIntegration.class similarity index 100% rename from test_data/FormatterIntegration.class rename to test-data/FormatterIntegration.class diff --git a/test_data/FormatterIntegration.txt b/test-data/FormatterIntegration.txt similarity index 100% rename from test_data/FormatterIntegration.txt rename to test-data/FormatterIntegration.txt diff --git a/test_data/Hello.class b/test-data/Hello.class similarity index 100% rename from test_data/Hello.class rename to test-data/Hello.class diff --git a/test_data/Hello.txt b/test-data/Hello.txt similarity index 100% rename from test_data/Hello.txt rename to test-data/Hello.txt diff --git a/test_data/IncompatibleStatic.class b/test-data/IncompatibleStatic.class similarity index 100% rename from test_data/IncompatibleStatic.class rename to test-data/IncompatibleStatic.class diff --git a/test_data/IncompatibleStatic.txt b/test-data/IncompatibleStatic.txt similarity index 100% rename from test_data/IncompatibleStatic.txt rename to test-data/IncompatibleStatic.txt diff --git a/test_data/Instanceof.class b/test-data/Instanceof.class similarity index 100% rename from test_data/Instanceof.class rename to test-data/Instanceof.class diff --git a/test_data/Instanceof.txt b/test-data/Instanceof.txt similarity index 100% rename from test_data/Instanceof.txt rename to test-data/Instanceof.txt diff --git a/test_data/IntegerOverflow.class b/test-data/IntegerOverflow.class similarity index 100% rename from test_data/IntegerOverflow.class rename to test-data/IntegerOverflow.class diff --git a/test_data/IntegerOverflow.txt b/test-data/IntegerOverflow.txt similarity index 100% rename from test_data/IntegerOverflow.txt rename to test-data/IntegerOverflow.txt diff --git a/test_data/Interface$IInterface.class b/test-data/Interface$IInterface.class similarity index 100% rename from test_data/Interface$IInterface.class rename to test-data/Interface$IInterface.class diff --git a/test_data/Interface$Implementation.class b/test-data/Interface$Implementation.class similarity index 100% rename from test_data/Interface$Implementation.class rename to test-data/Interface$Implementation.class diff --git a/test_data/Interface.class b/test-data/Interface.class similarity index 100% rename from test_data/Interface.class rename to test-data/Interface.class diff --git a/test_data/Interface.txt b/test-data/Interface.txt similarity index 100% rename from test_data/Interface.txt rename to test-data/Interface.txt diff --git a/test_data/InterfaceCast$Base.class b/test-data/InterfaceCast$Base.class similarity index 100% rename from test_data/InterfaceCast$Base.class rename to test-data/InterfaceCast$Base.class diff --git a/test_data/InterfaceCast$Derived.class b/test-data/InterfaceCast$Derived.class similarity index 100% rename from test_data/InterfaceCast$Derived.class rename to test-data/InterfaceCast$Derived.class diff --git a/test_data/InterfaceCast$IBase.class b/test-data/InterfaceCast$IBase.class similarity index 100% rename from test_data/InterfaceCast$IBase.class rename to test-data/InterfaceCast$IBase.class diff --git a/test_data/InterfaceCast$IFace.class b/test-data/InterfaceCast$IFace.class similarity index 100% rename from test_data/InterfaceCast$IFace.class rename to test-data/InterfaceCast$IFace.class diff --git a/test_data/InterfaceCast.class b/test-data/InterfaceCast.class similarity index 100% rename from test_data/InterfaceCast.class rename to test-data/InterfaceCast.class diff --git a/test_data/InterfaceCast.txt b/test-data/InterfaceCast.txt similarity index 100% rename from test_data/InterfaceCast.txt rename to test-data/InterfaceCast.txt diff --git a/test_data/LazyClinit$Base.class b/test-data/LazyClinit$Base.class similarity index 100% rename from test_data/LazyClinit$Base.class rename to test-data/LazyClinit$Base.class diff --git a/test_data/LazyClinit$Derived.class b/test-data/LazyClinit$Derived.class similarity index 100% rename from test_data/LazyClinit$Derived.class rename to test-data/LazyClinit$Derived.class diff --git a/test_data/LazyClinit$GetstaticTarget.class b/test-data/LazyClinit$GetstaticTarget.class similarity index 100% rename from test_data/LazyClinit$GetstaticTarget.class rename to test-data/LazyClinit$GetstaticTarget.class diff --git a/test_data/LazyClinit$IFace.class b/test-data/LazyClinit$IFace.class similarity index 100% rename from test_data/LazyClinit$IFace.class rename to test-data/LazyClinit$IFace.class diff --git a/test_data/LazyClinit$Impl.class b/test-data/LazyClinit$Impl.class similarity index 100% rename from test_data/LazyClinit$Impl.class rename to test-data/LazyClinit$Impl.class diff --git a/test_data/LazyClinit$NewTarget.class b/test-data/LazyClinit$NewTarget.class similarity index 100% rename from test_data/LazyClinit$NewTarget.class rename to test-data/LazyClinit$NewTarget.class diff --git a/test_data/LazyClinit$PutstaticTarget.class b/test-data/LazyClinit$PutstaticTarget.class similarity index 100% rename from test_data/LazyClinit$PutstaticTarget.class rename to test-data/LazyClinit$PutstaticTarget.class diff --git a/test_data/LazyClinit$SelfRef.class b/test-data/LazyClinit$SelfRef.class similarity index 100% rename from test_data/LazyClinit$SelfRef.class rename to test-data/LazyClinit$SelfRef.class diff --git a/test_data/LazyClinit.class b/test-data/LazyClinit.class similarity index 100% rename from test_data/LazyClinit.class rename to test-data/LazyClinit.class diff --git a/test_data/LazyClinit.txt b/test-data/LazyClinit.txt similarity index 100% rename from test_data/LazyClinit.txt rename to test-data/LazyClinit.txt diff --git a/test_data/LongDouble.class b/test-data/LongDouble.class similarity index 100% rename from test_data/LongDouble.class rename to test-data/LongDouble.class diff --git a/test_data/LongDouble.txt b/test-data/LongDouble.txt similarity index 100% rename from test_data/LongDouble.txt rename to test-data/LongDouble.txt diff --git a/test_data/Method.class b/test-data/Method.class similarity index 100% rename from test_data/Method.class rename to test-data/Method.class diff --git a/test_data/Method.txt b/test-data/Method.txt similarity index 100% rename from test_data/Method.txt rename to test-data/Method.txt diff --git a/test_data/MonitorSemantics$1.class b/test-data/MonitorSemantics$1.class similarity index 100% rename from test_data/MonitorSemantics$1.class rename to test-data/MonitorSemantics$1.class diff --git a/test_data/MonitorSemantics$CounterWorker.class b/test-data/MonitorSemantics$CounterWorker.class similarity index 100% rename from test_data/MonitorSemantics$CounterWorker.class rename to test-data/MonitorSemantics$CounterWorker.class diff --git a/test_data/MonitorSemantics$FailingWorker.class b/test-data/MonitorSemantics$FailingWorker.class similarity index 100% rename from test_data/MonitorSemantics$FailingWorker.class rename to test-data/MonitorSemantics$FailingWorker.class diff --git a/test_data/MonitorSemantics.class b/test-data/MonitorSemantics.class similarity index 100% rename from test_data/MonitorSemantics.class rename to test-data/MonitorSemantics.class diff --git a/test_data/MonitorSemantics.txt b/test-data/MonitorSemantics.txt similarity index 100% rename from test_data/MonitorSemantics.txt rename to test-data/MonitorSemantics.txt diff --git a/test_data/MultiArray.class b/test-data/MultiArray.class similarity index 100% rename from test_data/MultiArray.class rename to test-data/MultiArray.class diff --git a/test_data/MultiArray.txt b/test-data/MultiArray.txt similarity index 100% rename from test_data/MultiArray.txt rename to test-data/MultiArray.txt diff --git a/test_data/NativeMethod.class b/test-data/NativeMethod.class similarity index 100% rename from test_data/NativeMethod.class rename to test-data/NativeMethod.class diff --git a/test_data/NativeMethod.txt b/test-data/NativeMethod.txt similarity index 100% rename from test_data/NativeMethod.txt rename to test-data/NativeMethod.txt diff --git a/test_data/NullHandling.class b/test-data/NullHandling.class similarity index 100% rename from test_data/NullHandling.class rename to test-data/NullHandling.class diff --git a/test_data/NullHandling.txt b/test-data/NullHandling.txt similarity index 100% rename from test_data/NullHandling.txt rename to test-data/NullHandling.txt diff --git a/test_data/OddEven.class b/test-data/OddEven.class similarity index 100% rename from test_data/OddEven.class rename to test-data/OddEven.class diff --git a/test_data/OddEven.txt b/test-data/OddEven.txt similarity index 100% rename from test_data/OddEven.txt rename to test-data/OddEven.txt diff --git a/test_data/Pop2Test.class b/test-data/Pop2Test.class similarity index 100% rename from test_data/Pop2Test.class rename to test-data/Pop2Test.class diff --git a/test_data/Pop2Test.txt b/test-data/Pop2Test.txt similarity index 100% rename from test_data/Pop2Test.txt rename to test-data/Pop2Test.txt diff --git a/test_data/ReferenceCompare.class b/test-data/ReferenceCompare.class similarity index 100% rename from test_data/ReferenceCompare.class rename to test-data/ReferenceCompare.class diff --git a/test_data/ReferenceCompare.txt b/test-data/ReferenceCompare.txt similarity index 100% rename from test_data/ReferenceCompare.txt rename to test-data/ReferenceCompare.txt diff --git a/test_data/StaleHolder.class b/test-data/StaleHolder.class similarity index 100% rename from test_data/StaleHolder.class rename to test-data/StaleHolder.class diff --git a/test_data/StaleHolder.txt b/test-data/StaleHolder.txt similarity index 100% rename from test_data/StaleHolder.txt rename to test-data/StaleHolder.txt diff --git a/test_data/StaticFlag.class b/test-data/StaticFlag.class similarity index 100% rename from test_data/StaticFlag.class rename to test-data/StaticFlag.class diff --git a/test_data/StaticFlag.txt b/test-data/StaticFlag.txt similarity index 100% rename from test_data/StaticFlag.txt rename to test-data/StaticFlag.txt diff --git a/test_data/StaticInherit$Base.class b/test-data/StaticInherit$Base.class similarity index 100% rename from test_data/StaticInherit$Base.class rename to test-data/StaticInherit$Base.class diff --git a/test_data/StaticInherit$IConst.class b/test-data/StaticInherit$IConst.class similarity index 100% rename from test_data/StaticInherit$IConst.class rename to test-data/StaticInherit$IConst.class diff --git a/test_data/StaticInherit$Impl.class b/test-data/StaticInherit$Impl.class similarity index 100% rename from test_data/StaticInherit$Impl.class rename to test-data/StaticInherit$Impl.class diff --git a/test_data/StaticInherit$Sub.class b/test-data/StaticInherit$Sub.class similarity index 100% rename from test_data/StaticInherit$Sub.class rename to test-data/StaticInherit$Sub.class diff --git a/test_data/StaticInherit.class b/test-data/StaticInherit.class similarity index 100% rename from test_data/StaticInherit.class rename to test-data/StaticInherit.class diff --git a/test_data/StaticInherit.txt b/test-data/StaticInherit.txt similarity index 100% rename from test_data/StaticInherit.txt rename to test-data/StaticInherit.txt diff --git a/test_data/StaticInitTrigger$Base.class b/test-data/StaticInitTrigger$Base.class similarity index 100% rename from test_data/StaticInitTrigger$Base.class rename to test-data/StaticInitTrigger$Base.class diff --git a/test_data/StaticInitTrigger$Sub.class b/test-data/StaticInitTrigger$Sub.class similarity index 100% rename from test_data/StaticInitTrigger$Sub.class rename to test-data/StaticInitTrigger$Sub.class diff --git a/test_data/StaticInitTrigger.class b/test-data/StaticInitTrigger.class similarity index 100% rename from test_data/StaticInitTrigger.class rename to test-data/StaticInitTrigger.class diff --git a/test_data/StaticInitTrigger.txt b/test-data/StaticInitTrigger.txt similarity index 100% rename from test_data/StaticInitTrigger.txt rename to test-data/StaticInitTrigger.txt diff --git a/test_data/StaticOrder$Helper.class b/test-data/StaticOrder$Helper.class similarity index 100% rename from test_data/StaticOrder$Helper.class rename to test-data/StaticOrder$Helper.class diff --git a/test_data/StaticOrder.class b/test-data/StaticOrder.class similarity index 100% rename from test_data/StaticOrder.class rename to test-data/StaticOrder.class diff --git a/test_data/StaticOrder.txt b/test-data/StaticOrder.txt similarity index 100% rename from test_data/StaticOrder.txt rename to test-data/StaticOrder.txt diff --git a/test_data/StringIntern.class b/test-data/StringIntern.class similarity index 100% rename from test_data/StringIntern.class rename to test-data/StringIntern.class diff --git a/test_data/StringIntern.txt b/test-data/StringIntern.txt similarity index 100% rename from test_data/StringIntern.txt rename to test-data/StringIntern.txt diff --git a/test_data/SuperClass$InnerClass.class b/test-data/SuperClass$InnerClass.class similarity index 100% rename from test_data/SuperClass$InnerClass.class rename to test-data/SuperClass$InnerClass.class diff --git a/test_data/SuperClass$InnerDerivedClass.class b/test-data/SuperClass$InnerDerivedClass.class similarity index 100% rename from test_data/SuperClass$InnerDerivedClass.class rename to test-data/SuperClass$InnerDerivedClass.class diff --git a/test_data/SuperClass.class b/test-data/SuperClass.class similarity index 100% rename from test_data/SuperClass.class rename to test-data/SuperClass.class diff --git a/test_data/SuperClass.txt b/test-data/SuperClass.txt similarity index 100% rename from test_data/SuperClass.txt rename to test-data/SuperClass.txt diff --git a/test_data/SurrogateChars.class b/test-data/SurrogateChars.class similarity index 100% rename from test_data/SurrogateChars.class rename to test-data/SurrogateChars.class diff --git a/test_data/SurrogateChars.txt b/test-data/SurrogateChars.txt similarity index 100% rename from test_data/SurrogateChars.txt rename to test-data/SurrogateChars.txt diff --git a/test_data/Switch.class b/test-data/Switch.class similarity index 100% rename from test_data/Switch.class rename to test-data/Switch.class diff --git a/test_data/Switch.txt b/test-data/Switch.txt similarity index 100% rename from test_data/Switch.txt rename to test-data/Switch.txt diff --git a/test_data/ThreadInterruption$DaemonWorker.class b/test-data/ThreadInterruption$DaemonWorker.class similarity index 100% rename from test_data/ThreadInterruption$DaemonWorker.class rename to test-data/ThreadInterruption$DaemonWorker.class diff --git a/test_data/ThreadInterruption$JoinWorker.class b/test-data/ThreadInterruption$JoinWorker.class similarity index 100% rename from test_data/ThreadInterruption$JoinWorker.class rename to test-data/ThreadInterruption$JoinWorker.class diff --git a/test_data/ThreadInterruption$PreInterruptedSleepWorker.class b/test-data/ThreadInterruption$PreInterruptedSleepWorker.class similarity index 100% rename from test_data/ThreadInterruption$PreInterruptedSleepWorker.class rename to test-data/ThreadInterruption$PreInterruptedSleepWorker.class diff --git a/test_data/ThreadInterruption$TargetWorker.class b/test-data/ThreadInterruption$TargetWorker.class similarity index 100% rename from test_data/ThreadInterruption$TargetWorker.class rename to test-data/ThreadInterruption$TargetWorker.class diff --git a/test_data/ThreadInterruption$WaitWorker.class b/test-data/ThreadInterruption$WaitWorker.class similarity index 100% rename from test_data/ThreadInterruption$WaitWorker.class rename to test-data/ThreadInterruption$WaitWorker.class diff --git a/test_data/ThreadInterruption.class b/test-data/ThreadInterruption.class similarity index 100% rename from test_data/ThreadInterruption.class rename to test-data/ThreadInterruption.class diff --git a/test_data/ThreadInterruption.txt b/test-data/ThreadInterruption.txt similarity index 100% rename from test_data/ThreadInterruption.txt rename to test-data/ThreadInterruption.txt diff --git a/test_data/ThrowableCause.class b/test-data/ThrowableCause.class similarity index 100% rename from test_data/ThrowableCause.class rename to test-data/ThrowableCause.class diff --git a/test_data/ThrowableCause.txt b/test-data/ThrowableCause.txt similarity index 100% rename from test_data/ThrowableCause.txt rename to test-data/ThrowableCause.txt diff --git a/test_data/TimeApi.class b/test-data/TimeApi.class similarity index 100% rename from test_data/TimeApi.class rename to test-data/TimeApi.class diff --git a/test_data/TimeApi.txt b/test-data/TimeApi.txt similarity index 100% rename from test_data/TimeApi.txt rename to test-data/TimeApi.txt diff --git a/test_data/TypeConversion.class b/test-data/TypeConversion.class similarity index 100% rename from test_data/TypeConversion.class rename to test-data/TypeConversion.class diff --git a/test_data/TypeConversion.txt b/test-data/TypeConversion.txt similarity index 100% rename from test_data/TypeConversion.txt rename to test-data/TypeConversion.txt diff --git a/test_data/UnsupportedCharset.class b/test-data/UnsupportedCharset.class similarity index 100% rename from test_data/UnsupportedCharset.class rename to test-data/UnsupportedCharset.class diff --git a/test_data/UnsupportedCharset.txt b/test-data/UnsupportedCharset.txt similarity index 100% rename from test_data/UnsupportedCharset.txt rename to test-data/UnsupportedCharset.txt diff --git a/test_data/VirtualDispatchSemantics.class b/test-data/VirtualDispatchSemantics.class similarity index 100% rename from test_data/VirtualDispatchSemantics.class rename to test-data/VirtualDispatchSemantics.class diff --git a/test_data/VirtualDispatchSemantics.txt b/test-data/VirtualDispatchSemantics.txt similarity index 100% rename from test_data/VirtualDispatchSemantics.txt rename to test-data/VirtualDispatchSemantics.txt diff --git a/test_data/WideLocals.class b/test-data/WideLocals.class similarity index 100% rename from test_data/WideLocals.class rename to test-data/WideLocals.class diff --git a/test_data/WideLocals.txt b/test-data/WideLocals.txt similarity index 100% rename from test_data/WideLocals.txt rename to test-data/WideLocals.txt diff --git a/test_data/ZipCorrupt.class b/test-data/ZipCorrupt.class similarity index 93% rename from test_data/ZipCorrupt.class rename to test-data/ZipCorrupt.class index 37b7442a..d8163983 100644 Binary files a/test_data/ZipCorrupt.class and b/test-data/ZipCorrupt.class differ diff --git a/test_data/ZipCorrupt.txt b/test-data/ZipCorrupt.txt similarity index 100% rename from test_data/ZipCorrupt.txt rename to test-data/ZipCorrupt.txt diff --git a/test_data/dispatch/base/PackageBase.class b/test-data/dispatch/base/PackageBase.class similarity index 100% rename from test_data/dispatch/base/PackageBase.class rename to test-data/dispatch/base/PackageBase.class diff --git a/test_data/dispatch/base/ProtectedBridge.class b/test-data/dispatch/base/ProtectedBridge.class similarity index 100% rename from test_data/dispatch/base/ProtectedBridge.class rename to test-data/dispatch/base/ProtectedBridge.class diff --git a/test_data/dispatch/base/PublicBridge.class b/test-data/dispatch/base/PublicBridge.class similarity index 100% rename from test_data/dispatch/base/PublicBridge.class rename to test-data/dispatch/base/PublicBridge.class diff --git a/test_data/dispatch/base/SamePackageChild.class b/test-data/dispatch/base/SamePackageChild.class similarity index 100% rename from test_data/dispatch/base/SamePackageChild.class rename to test-data/dispatch/base/SamePackageChild.class diff --git a/test_data/dispatch/foreign/ForeignChild.class b/test-data/dispatch/foreign/ForeignChild.class similarity index 100% rename from test_data/dispatch/foreign/ForeignChild.class rename to test-data/dispatch/foreign/ForeignChild.class diff --git a/test_data/dispatch/foreign/ForeignProtectedGrandchild.class b/test-data/dispatch/foreign/ForeignProtectedGrandchild.class similarity index 100% rename from test_data/dispatch/foreign/ForeignProtectedGrandchild.class rename to test-data/dispatch/foreign/ForeignProtectedGrandchild.class diff --git a/test_data/dispatch/foreign/ForeignPublicGrandchild.class b/test-data/dispatch/foreign/ForeignPublicGrandchild.class similarity index 100% rename from test_data/dispatch/foreign/ForeignPublicGrandchild.class rename to test-data/dispatch/foreign/ForeignPublicGrandchild.class diff --git a/test_data/dispatch/interfaces/InheritedOperation.class b/test-data/dispatch/interfaces/InheritedOperation.class similarity index 100% rename from test_data/dispatch/interfaces/InheritedOperation.class rename to test-data/dispatch/interfaces/InheritedOperation.class diff --git a/test_data/dispatch/interfaces/InterfaceImplementation.class b/test-data/dispatch/interfaces/InterfaceImplementation.class similarity index 100% rename from test_data/dispatch/interfaces/InterfaceImplementation.class rename to test-data/dispatch/interfaces/InterfaceImplementation.class diff --git a/test_data/dispatch/interfaces/InterfaceOwner.class b/test-data/dispatch/interfaces/InterfaceOwner.class similarity index 100% rename from test_data/dispatch/interfaces/InterfaceOwner.class rename to test-data/dispatch/interfaces/InterfaceOwner.class diff --git a/test_data/loader/Base.class b/test-data/loader/Base.class similarity index 100% rename from test_data/loader/Base.class rename to test-data/loader/Base.class diff --git a/test_data/loader/Payload.class b/test-data/loader/Payload.class similarity index 100% rename from test_data/loader/Payload.class rename to test-data/loader/Payload.class diff --git a/test_data/src/Abstract.java b/test-data/src/Abstract.java similarity index 100% rename from test_data/src/Abstract.java rename to test-data/src/Abstract.java diff --git a/test_data/src/Array.java b/test-data/src/Array.java similarity index 100% rename from test_data/src/Array.java rename to test-data/src/Array.java diff --git a/test_data/src/ArrayCovariance.java b/test-data/src/ArrayCovariance.java similarity index 100% rename from test_data/src/ArrayCovariance.java rename to test-data/src/ArrayCovariance.java diff --git a/test_data/src/ArrayEdgeCases.java b/test-data/src/ArrayEdgeCases.java similarity index 100% rename from test_data/src/ArrayEdgeCases.java rename to test-data/src/ArrayEdgeCases.java diff --git a/test_data/src/ArrayStore.java b/test-data/src/ArrayStore.java similarity index 100% rename from test_data/src/ArrayStore.java rename to test-data/src/ArrayStore.java diff --git a/test_data/src/BooleanTest.java b/test-data/src/BooleanTest.java similarity index 100% rename from test_data/src/BooleanTest.java rename to test-data/src/BooleanTest.java diff --git a/test_data/src/CheckCast.java b/test-data/src/CheckCast.java similarity index 100% rename from test_data/src/CheckCast.java rename to test-data/src/CheckCast.java diff --git a/test_data/src/ClassMetadata.java b/test-data/src/ClassMetadata.java similarity index 100% rename from test_data/src/ClassMetadata.java rename to test-data/src/ClassMetadata.java diff --git a/test_data/src/ClinitFailure.java b/test-data/src/ClinitFailure.java similarity index 100% rename from test_data/src/ClinitFailure.java rename to test-data/src/ClinitFailure.java diff --git a/test_data/src/CollectionsInvokeInterface.java b/test-data/src/CollectionsInvokeInterface.java similarity index 100% rename from test_data/src/CollectionsInvokeInterface.java rename to test-data/src/CollectionsInvokeInterface.java diff --git a/test_data/src/ConcurrentClinit.java b/test-data/src/ConcurrentClinit.java similarity index 100% rename from test_data/src/ConcurrentClinit.java rename to test-data/src/ConcurrentClinit.java diff --git a/test_data/src/Constants.java b/test-data/src/Constants.java similarity index 100% rename from test_data/src/Constants.java rename to test-data/src/Constants.java diff --git a/test_data/src/ConstantsReader.java b/test-data/src/ConstantsReader.java similarity index 100% rename from test_data/src/ConstantsReader.java rename to test-data/src/ConstantsReader.java diff --git a/test_data/src/ControlFlow.java b/test-data/src/ControlFlow.java similarity index 100% rename from test_data/src/ControlFlow.java rename to test-data/src/ControlFlow.java diff --git a/test_data/src/CurrentThread.java b/test-data/src/CurrentThread.java similarity index 100% rename from test_data/src/CurrentThread.java rename to test-data/src/CurrentThread.java diff --git a/test_data/src/DoubleInit.java b/test-data/src/DoubleInit.java similarity index 100% rename from test_data/src/DoubleInit.java rename to test-data/src/DoubleInit.java diff --git a/test_data/src/Dup.java b/test-data/src/Dup.java similarity index 100% rename from test_data/src/Dup.java rename to test-data/src/Dup.java diff --git a/test_data/src/Exception.java b/test-data/src/Exception.java similarity index 100% rename from test_data/src/Exception.java rename to test-data/src/Exception.java diff --git a/test_data/src/Field.java b/test-data/src/Field.java similarity index 100% rename from test_data/src/Field.java rename to test-data/src/Field.java diff --git a/test_data/src/FieldTypes.java b/test-data/src/FieldTypes.java similarity index 100% rename from test_data/src/FieldTypes.java rename to test-data/src/FieldTypes.java diff --git a/test_data/src/FileErrors.java b/test-data/src/FileErrors.java similarity index 100% rename from test_data/src/FileErrors.java rename to test-data/src/FileErrors.java diff --git a/test_data/src/FileLength.java b/test-data/src/FileLength.java similarity index 100% rename from test_data/src/FileLength.java rename to test-data/src/FileLength.java diff --git a/test_data/src/ForName.java b/test-data/src/ForName.java similarity index 100% rename from test_data/src/ForName.java rename to test-data/src/ForName.java diff --git a/test_data/src/FormatterIntegration.java b/test-data/src/FormatterIntegration.java similarity index 100% rename from test_data/src/FormatterIntegration.java rename to test-data/src/FormatterIntegration.java diff --git a/test_data/src/Hello.java b/test-data/src/Hello.java similarity index 100% rename from test_data/src/Hello.java rename to test-data/src/Hello.java diff --git a/test_data/src/IncompatibleStatic.java b/test-data/src/IncompatibleStatic.java similarity index 100% rename from test_data/src/IncompatibleStatic.java rename to test-data/src/IncompatibleStatic.java diff --git a/test_data/src/Instanceof.java b/test-data/src/Instanceof.java similarity index 100% rename from test_data/src/Instanceof.java rename to test-data/src/Instanceof.java diff --git a/test_data/src/IntegerOverflow.java b/test-data/src/IntegerOverflow.java similarity index 100% rename from test_data/src/IntegerOverflow.java rename to test-data/src/IntegerOverflow.java diff --git a/test_data/src/Interface.java b/test-data/src/Interface.java similarity index 100% rename from test_data/src/Interface.java rename to test-data/src/Interface.java diff --git a/test_data/src/InterfaceCast.java b/test-data/src/InterfaceCast.java similarity index 100% rename from test_data/src/InterfaceCast.java rename to test-data/src/InterfaceCast.java diff --git a/test_data/src/LazyClinit.java b/test-data/src/LazyClinit.java similarity index 100% rename from test_data/src/LazyClinit.java rename to test-data/src/LazyClinit.java diff --git a/test_data/src/LongDouble.java b/test-data/src/LongDouble.java similarity index 100% rename from test_data/src/LongDouble.java rename to test-data/src/LongDouble.java diff --git a/test_data/src/Method.java b/test-data/src/Method.java similarity index 100% rename from test_data/src/Method.java rename to test-data/src/Method.java diff --git a/test_data/src/MonitorSemantics.java b/test-data/src/MonitorSemantics.java similarity index 100% rename from test_data/src/MonitorSemantics.java rename to test-data/src/MonitorSemantics.java diff --git a/test_data/src/MultiArray.java b/test-data/src/MultiArray.java similarity index 100% rename from test_data/src/MultiArray.java rename to test-data/src/MultiArray.java diff --git a/test_data/src/NativeMethod.java b/test-data/src/NativeMethod.java similarity index 100% rename from test_data/src/NativeMethod.java rename to test-data/src/NativeMethod.java diff --git a/test_data/src/NullHandling.java b/test-data/src/NullHandling.java similarity index 100% rename from test_data/src/NullHandling.java rename to test-data/src/NullHandling.java diff --git a/test_data/src/OddEven.java b/test-data/src/OddEven.java similarity index 100% rename from test_data/src/OddEven.java rename to test-data/src/OddEven.java diff --git a/test_data/src/Pop2Test.java b/test-data/src/Pop2Test.java similarity index 100% rename from test_data/src/Pop2Test.java rename to test-data/src/Pop2Test.java diff --git a/test_data/src/ReferenceCompare.java b/test-data/src/ReferenceCompare.java similarity index 100% rename from test_data/src/ReferenceCompare.java rename to test-data/src/ReferenceCompare.java diff --git a/test_data/src/StaleHolder.java b/test-data/src/StaleHolder.java similarity index 100% rename from test_data/src/StaleHolder.java rename to test-data/src/StaleHolder.java diff --git a/test_data/src/StaticFlag.java b/test-data/src/StaticFlag.java similarity index 100% rename from test_data/src/StaticFlag.java rename to test-data/src/StaticFlag.java diff --git a/test_data/src/StaticInherit.java b/test-data/src/StaticInherit.java similarity index 100% rename from test_data/src/StaticInherit.java rename to test-data/src/StaticInherit.java diff --git a/test_data/src/StaticInitTrigger.java b/test-data/src/StaticInitTrigger.java similarity index 100% rename from test_data/src/StaticInitTrigger.java rename to test-data/src/StaticInitTrigger.java diff --git a/test_data/src/StaticOrder.java b/test-data/src/StaticOrder.java similarity index 100% rename from test_data/src/StaticOrder.java rename to test-data/src/StaticOrder.java diff --git a/test_data/src/StringIntern.java b/test-data/src/StringIntern.java similarity index 100% rename from test_data/src/StringIntern.java rename to test-data/src/StringIntern.java diff --git a/test_data/src/SuperClass.java b/test-data/src/SuperClass.java similarity index 100% rename from test_data/src/SuperClass.java rename to test-data/src/SuperClass.java diff --git a/test_data/src/SurrogateChars.java b/test-data/src/SurrogateChars.java similarity index 100% rename from test_data/src/SurrogateChars.java rename to test-data/src/SurrogateChars.java diff --git a/test_data/src/Switch.java b/test-data/src/Switch.java similarity index 100% rename from test_data/src/Switch.java rename to test-data/src/Switch.java diff --git a/test_data/src/ThreadInterruption.java b/test-data/src/ThreadInterruption.java similarity index 100% rename from test_data/src/ThreadInterruption.java rename to test-data/src/ThreadInterruption.java diff --git a/test_data/src/ThrowableCause.java b/test-data/src/ThrowableCause.java similarity index 100% rename from test_data/src/ThrowableCause.java rename to test-data/src/ThrowableCause.java diff --git a/test_data/src/TypeConversion.java b/test-data/src/TypeConversion.java similarity index 100% rename from test_data/src/TypeConversion.java rename to test-data/src/TypeConversion.java diff --git a/test_data/src/UnsupportedCharset.java b/test-data/src/UnsupportedCharset.java similarity index 100% rename from test_data/src/UnsupportedCharset.java rename to test-data/src/UnsupportedCharset.java diff --git a/test_data/src/VirtualDispatchSemantics.java b/test-data/src/VirtualDispatchSemantics.java similarity index 100% rename from test_data/src/VirtualDispatchSemantics.java rename to test-data/src/VirtualDispatchSemantics.java diff --git a/test_data/src/WideLocals.java b/test-data/src/WideLocals.java similarity index 100% rename from test_data/src/WideLocals.java rename to test-data/src/WideLocals.java diff --git a/test_data/src/ZipCorrupt.java b/test-data/src/ZipCorrupt.java similarity index 83% rename from test_data/src/ZipCorrupt.java rename to test-data/src/ZipCorrupt.java index e84a23ad..1dd7399d 100644 --- a/test_data/src/ZipCorrupt.java +++ b/test-data/src/ZipCorrupt.java @@ -5,7 +5,7 @@ public class ZipCorrupt { public static void main(String[] args) throws Exception { try { - new ZipFile(new File("test_data/FileLength.txt")); + new ZipFile(new File("test-data/FileLength.txt")); System.out.println("no-ex"); } catch (ZipException e) { System.out.println("zipex"); diff --git a/test_data/src/dispatch/base/PackageBase.java b/test-data/src/dispatch/base/PackageBase.java similarity index 100% rename from test_data/src/dispatch/base/PackageBase.java rename to test-data/src/dispatch/base/PackageBase.java diff --git a/test_data/src/dispatch/base/ProtectedBridge.java b/test-data/src/dispatch/base/ProtectedBridge.java similarity index 100% rename from test_data/src/dispatch/base/ProtectedBridge.java rename to test-data/src/dispatch/base/ProtectedBridge.java diff --git a/test_data/src/dispatch/base/PublicBridge.java b/test-data/src/dispatch/base/PublicBridge.java similarity index 100% rename from test_data/src/dispatch/base/PublicBridge.java rename to test-data/src/dispatch/base/PublicBridge.java diff --git a/test_data/src/dispatch/base/SamePackageChild.java b/test-data/src/dispatch/base/SamePackageChild.java similarity index 100% rename from test_data/src/dispatch/base/SamePackageChild.java rename to test-data/src/dispatch/base/SamePackageChild.java diff --git a/test_data/src/dispatch/foreign/ForeignChild.java b/test-data/src/dispatch/foreign/ForeignChild.java similarity index 100% rename from test_data/src/dispatch/foreign/ForeignChild.java rename to test-data/src/dispatch/foreign/ForeignChild.java diff --git a/test_data/src/dispatch/foreign/ForeignProtectedGrandchild.java b/test-data/src/dispatch/foreign/ForeignProtectedGrandchild.java similarity index 100% rename from test_data/src/dispatch/foreign/ForeignProtectedGrandchild.java rename to test-data/src/dispatch/foreign/ForeignProtectedGrandchild.java diff --git a/test_data/src/dispatch/foreign/ForeignPublicGrandchild.java b/test-data/src/dispatch/foreign/ForeignPublicGrandchild.java similarity index 100% rename from test_data/src/dispatch/foreign/ForeignPublicGrandchild.java rename to test-data/src/dispatch/foreign/ForeignPublicGrandchild.java diff --git a/test_data/src/dispatch/interfaces/InheritedOperation.java b/test-data/src/dispatch/interfaces/InheritedOperation.java similarity index 100% rename from test_data/src/dispatch/interfaces/InheritedOperation.java rename to test-data/src/dispatch/interfaces/InheritedOperation.java diff --git a/test_data/src/dispatch/interfaces/InterfaceImplementation.java b/test-data/src/dispatch/interfaces/InterfaceImplementation.java similarity index 100% rename from test_data/src/dispatch/interfaces/InterfaceImplementation.java rename to test-data/src/dispatch/interfaces/InterfaceImplementation.java diff --git a/test_data/src/dispatch/interfaces/InterfaceOwner.java b/test-data/src/dispatch/interfaces/InterfaceOwner.java similarity index 100% rename from test_data/src/dispatch/interfaces/InterfaceOwner.java rename to test-data/src/dispatch/interfaces/InterfaceOwner.java diff --git a/test_data/src/jar/JarTest.class b/test-data/src/jar/JarTest.class similarity index 100% rename from test_data/src/jar/JarTest.class rename to test-data/src/jar/JarTest.class diff --git a/test_data/src/jar/JarTest.java b/test-data/src/jar/JarTest.java similarity index 100% rename from test_data/src/jar/JarTest.java rename to test-data/src/jar/JarTest.java diff --git a/test_data/src/jar/Manifest.txt b/test-data/src/jar/Manifest.txt similarity index 100% rename from test_data/src/jar/Manifest.txt rename to test-data/src/jar/Manifest.txt diff --git a/test_data/src/jar/test.txt b/test-data/src/jar/test.txt similarity index 100% rename from test_data/src/jar/test.txt rename to test-data/src/jar/test.txt diff --git a/test_data/src/loader/Base.java b/test-data/src/loader/Base.java similarity index 100% rename from test_data/src/loader/Base.java rename to test-data/src/loader/Base.java diff --git a/test_data/src/loader/Payload.java b/test-data/src/loader/Payload.java similarity index 100% rename from test_data/src/loader/Payload.java rename to test-data/src/loader/Payload.java diff --git a/test_data/test.jar b/test-data/test.jar similarity index 100% rename from test_data/test.jar rename to test-data/test.jar diff --git a/test_data/test.txt b/test-data/test.txt similarity index 100% rename from test_data/test.txt rename to test-data/test.txt diff --git a/test_utils/Cargo.toml b/test-utils/Cargo.toml similarity index 61% rename from test_utils/Cargo.toml rename to test-utils/Cargo.toml index 478430bd..11c41746 100644 --- a/test_utils/Cargo.toml +++ b/test-utils/Cargo.toml @@ -1,8 +1,10 @@ [package] -name = "test_utils" +name = "test-utils" +description = "Testing utilities for the RustJava workspace" version.workspace = true edition.workspace = true license.workspace = true +publish = false [dependencies] async-trait = { workspace = true } @@ -10,5 +12,5 @@ tracing = { workspace = true } tokio = { workspace = true, features = ["rt-multi-thread", "sync", "time"] } jvm = { workspace = true } -jvm_rust = { workspace = true } -java_runtime = { workspace = true } +jvm-bytecode = { workspace = true } +rustjava-runtime = { workspace = true } diff --git a/test_utils/src/lib.rs b/test-utils/src/lib.rs similarity index 99% rename from test_utils/src/lib.rs rename to test-utils/src/lib.rs index ada84014..a0a2f410 100644 --- a/test_utils/src/lib.rs +++ b/test-utils/src/lib.rs @@ -20,9 +20,9 @@ use std::{ use tokio::sync::{Notify, oneshot}; use jvm::{ClassDefinition, Jvm, Result}; -use jvm_rust::{ArrayClassDefinitionImpl, ClassDefinitionError, ClassDefinitionImpl}; +use jvm_bytecode::{ArrayClassDefinitionImpl, ClassDefinitionError, ClassDefinitionImpl}; -use java_runtime::{ +use rustjava_runtime::{ File, FileDescriptorId, FileOpenOptions, FileSize, FileStat, FileType, IOError, IOResult, RT_RUSTJAR, Runtime, SpawnCallback, get_bootstrap_class_loader, get_runtime_class_proto, }; diff --git a/tests/test_class.rs b/tests/test_class.rs index ce4588af..f039eae4 100644 --- a/tests/test_class.rs +++ b/tests/test_class.rs @@ -9,7 +9,7 @@ use test_helper::{run_class, run_jar}; // TODO parameterized tests.. #[tokio::test] async fn test_class() -> Result<()> { - let base_path = Path::new("test_data"); + let base_path = Path::new("test-data"); let paths = fs::read_dir(base_path).unwrap(); @@ -35,7 +35,7 @@ async fn test_class() -> Result<()> { let result = if extension.unwrap().to_str().unwrap() == "jar" { run_jar(&path, &[]).await } else { - run_class(&path, &[Path::new("./test_data/")], &[]).await + run_class(&path, &[Path::new("./test-data/")], &[]).await }; if let Err(err) = result { diff --git a/tests/test_class_format.rs b/tests/test_class_format.rs index c05e749e..048c00f9 100644 --- a/tests/test_class_format.rs +++ b/tests/test_class_format.rs @@ -9,11 +9,11 @@ use std::{ use test_helper::run_class; -// Fixtures are derived deterministically from the committed test_data/Hello.class +// Fixtures are derived deterministically from the committed test-data/Hello.class // by byte manipulation, so corruption scenarios stay reproducible without // committing corrupted binaries. fn fixture(name: &str, bytes: &[u8]) -> (PathBuf, PathBuf) { - // relative path with trailing slash, like "./test_data/": classpath entries are + // relative path with trailing slash, like "./test-data/": classpath entries are // turned into URLs and joined with the class file name let dir = PathBuf::from(format!("./target/class_format_fixtures_{}/", std::process::id())); fs::create_dir_all(&dir).unwrap(); @@ -25,7 +25,7 @@ fn fixture(name: &str, bytes: &[u8]) -> (PathBuf, PathBuf) { } fn hello_class() -> Vec { - fs::read("test_data/Hello.class").unwrap() + fs::read("test-data/Hello.class").unwrap() } // Only the exception *kind* is asserted, not the message: upstream `ClassFileError` @@ -43,7 +43,7 @@ async fn test_truncated_class_raises_class_format_error() { async fn test_unsupported_constant_pool_tag_raises_class_format_error() { let mut bytes = hello_class(); // offset 10 is the first constant pool tag; 10 (Methodref) in the committed fixture - assert_eq!(bytes[10], 10, "test_data/Hello.class layout changed; adjust the mutation offset"); + assert_eq!(bytes[10], 10, "test-data/Hello.class layout changed; adjust the mutation offset"); bytes[10] = 18; // CONSTANT_InvokeDynamic, unsupported let (dir, path) = fixture("BadTagHello.class", &bytes); diff --git a/tests/test_cli.rs b/tests/test_cli.rs index 8b29d969..04c94574 100644 --- a/tests/test_cli.rs +++ b/tests/test_cli.rs @@ -2,7 +2,7 @@ use std::{env, process::Command}; #[test] fn cli_classpath_options_load_classes_from_directories_and_jars() { - let class_path = env::join_paths(["missing", "test_data"]).unwrap(); + let class_path = env::join_paths(["missing", "test-data"]).unwrap(); let output = Command::new(env!("CARGO_BIN_EXE_rust_java")) .env_remove("CLASSPATH") .arg("-cp") @@ -15,7 +15,7 @@ fn cli_classpath_options_load_classes_from_directories_and_jars() { let output = Command::new(env!("CARGO_BIN_EXE_rust_java")) .env_remove("CLASSPATH") - .args(["-classpath", "test_data/test.jar", "JarTest"]) + .args(["-classpath", "test-data/test.jar", "JarTest"]) .output() .unwrap(); assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr)); @@ -25,7 +25,7 @@ fn cli_classpath_options_load_classes_from_directories_and_jars() { #[test] fn cli_classpath_loads_from_absolute_entries() { let working_directory = env::current_dir().unwrap(); - let class_path = working_directory.join("test_data"); + let class_path = working_directory.join("test-data"); let output = Command::new(env!("CARGO_BIN_EXE_rust_java")) .env_remove("CLASSPATH") .arg("-cp") @@ -36,7 +36,7 @@ fn cli_classpath_loads_from_absolute_entries() { assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr)); assert_eq!(String::from_utf8(output.stdout).unwrap(), "Hello, world!\n"); - let class_path = working_directory.join("test_data/test.jar"); + let class_path = working_directory.join("test-data/test.jar"); let output = Command::new(env!("CARGO_BIN_EXE_rust_java")) .env_remove("CLASSPATH") .arg("-classpath") @@ -51,7 +51,7 @@ fn cli_classpath_loads_from_absolute_entries() { #[test] fn cli_classpath_uses_environment_and_cli_override() { let output = Command::new(env!("CARGO_BIN_EXE_rust_java")) - .env("CLASSPATH", "test_data") + .env("CLASSPATH", "test-data") .arg("Hello") .output() .unwrap(); @@ -60,7 +60,7 @@ fn cli_classpath_uses_environment_and_cli_override() { let output = Command::new(env!("CARGO_BIN_EXE_rust_java")) .env("CLASSPATH", "missing") - .args(["-cp", "test_data", "Hello"]) + .args(["-cp", "test-data", "Hello"]) .output() .unwrap(); assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr)); @@ -71,7 +71,7 @@ fn cli_classpath_uses_environment_and_cli_override() { fn cli_jar_mode_accepts_but_ignores_classpath_options() { let output = Command::new(env!("CARGO_BIN_EXE_rust_java")) .env("CLASSPATH", "also-ignored") - .args(["-cp", "ignored", "-jar", "test_data/test.jar"]) + .args(["-cp", "ignored", "-jar", "test-data/test.jar"]) .output() .unwrap(); assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr)); @@ -82,7 +82,7 @@ fn cli_jar_mode_accepts_but_ignores_classpath_options() { fn cli_defaults_classpath_to_current_directory() { let output = Command::new(env!("CARGO_BIN_EXE_rust_java")) .env_remove("CLASSPATH") - .current_dir("test_data") + .current_dir("test-data") .arg("Hello") .output() .unwrap(); diff --git a/tests/test_real_jvm.rs b/tests/test_real_jvm.rs index 6e76477b..06914fce 100644 --- a/tests/test_real_jvm.rs +++ b/tests/test_real_jvm.rs @@ -10,7 +10,7 @@ use test_helper::{run_class, run_jar}; #[tokio::test] #[ignore] async fn test_real_jvm() -> Result<()> { - let base_path = Path::new("test_data"); + let base_path = Path::new("test-data"); let paths = fs::read_dir(base_path).unwrap(); @@ -43,7 +43,7 @@ async fn test_real_jvm() -> Result<()> { .unwrap(); ( - run_class(&path, &[Path::new("./test_data/")], &[]).await, + run_class(&path, &[Path::new("./test-data/")], &[]).await, String::from_utf8(java_result.stdout).unwrap(), ) };