Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move Windows code into a module #924

Merged
merged 1 commit into from
Jan 30, 2024
Merged

Conversation

Be-ing
Copy link
Contributor

@Be-ing Be-ing commented Jan 29, 2024

No description provided.

@Be-ing Be-ing force-pushed the windows_mod branch 6 times, most recently from fdf4f07 to 98cc46e Compare January 29, 2024 01:31
mod windows;
// Regardless of whether this should be in this crate's public API,
// it has been since 2015, so don't break it.
pub use windows::find_tools as windows_registry;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Maybe make this #[doc(hidden)]?

Copy link
Collaborator

@NobodyXu NobodyXu left a comment

Choose a reason for hiding this comment

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

Thanks, overall it LGTM but has two minor suggestions.

Also, can you please run gen-windows-sys-binding locally to make sure it works with the changed location?

src/lib.rs Outdated Show resolved Hide resolved
src/lib.rs Outdated Show resolved Hide resolved
@Be-ing
Copy link
Contributor Author

Be-ing commented Jan 30, 2024

Also, can you please run gen-windows-sys-binding locally to make sure it works with the changed location?

Ah yeah, it needed a little adjustment since moving gen-windows-sys-binding to the dev-tools directory in #927. Now it works regardless of how you run gen-windows-sys-binding.

@Be-ing
Copy link
Contributor Author

Be-ing commented Jan 30, 2024

This is easier to navigate now:

cc-rs on  windows_mod [$] is 📦 v1.0.84 via 🦀 v1.75.0 on ☁  (auto) 
❯ tree
.
├── Cargo.toml
├── dev-tools
│   ├── cc-test
│   │   ├── build.rs
│   │   ├── Cargo.toml
│   │   ├── src
│   │   │   ├── aarch64.asm
│   │   │   ├── aarch64.S
│   │   │   ├── armv7.S
│   │   │   ├── bar1.c
│   │   │   ├── bar2.c
│   │   │   ├── baz.cpp
│   │   │   ├── compile_error.c
│   │   │   ├── cuda.cu
│   │   │   ├── dummy.c
│   │   │   ├── expand.c
│   │   │   ├── foo.c
│   │   │   ├── i686.asm
│   │   │   ├── i686.S
│   │   │   ├── include
│   │   │   │   └── foo.h
│   │   │   ├── lib.rs
│   │   │   ├── msvc.c
│   │   │   ├── NMakefile
│   │   │   ├── opt_linkage.c
│   │   │   ├── riscv64gc.S
│   │   │   ├── windows.c
│   │   │   ├── x86_64.asm
│   │   │   └── x86_64.S
│   │   └── tests
│   │       ├── all.rs
│   │       └── output.rs
│   └── gen-windows-sys-binding
│       ├── Cargo.toml
│       ├── src
│       │   └── main.rs
│       └── windows_sys.list
├── LICENSE-APACHE
├── LICENSE-MIT
├── README.md
├── src
│   ├── bin
│   │   └── gcc-shim.rs
│   ├── command_helpers.rs
│   ├── lib.rs
│   ├── os_pipe
│   │   ├── mod.rs
│   │   ├── unix.rs
│   │   └── windows.rs
│   ├── parallel
│   │   ├── async_executor.rs
│   │   ├── job_token
│   │   │   ├── mod.rs
│   │   │   ├── unix.rs
│   │   │   └── windows.rs
│   │   └── mod.rs
│   ├── tool.rs
│   └── windows
│       ├── com.rs
│       ├── find_tools.rs
│       ├── mod.rs
│       ├── registry.rs
│       ├── setup_config.rs
│       ├── vs_instances.rs
│       ├── winapi.rs
│       └── windows_sys.rs
└── tests
    ├── cc_env.rs
    ├── cflags.rs
    ├── cxxflags.rs
    ├── support
    │   └── mod.rs
    └── test.rs

16 directories, 58 files

Copy link
Collaborator

@NobodyXu NobodyXu left a comment

Choose a reason for hiding this comment

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

Thanks!

@NobodyXu NobodyXu merged commit 3aa67cc into rust-lang:main Jan 30, 2024
18 checks passed
@Be-ing Be-ing deleted the windows_mod branch January 30, 2024 06:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants