Skip to content

Commit 5035541

Browse files
dirkvdbdirkvdb
committed
Reorganize to have rust crate in the root
1 parent dc6d12d commit 5035541

File tree

403 files changed

+2357
-238
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

403 files changed

+2357
-238
lines changed

‎.cargo/config.toml‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
[env]
2+
GDAL_STATIC = "1"
3+
GDAL_HOME = { value = "target/vcpkg/installed/arm64-osx-release", relative = true }
4+
PKG_CONFIG = { value = "target/vcpkg/installed/arm64-osx-release/tools/pkgconf/pkgconf", relative = true }
5+
PKG_CONFIG_PATH = { value = "target/vcpkg/installed/arm64-osx-release/lib/pkgconfig", relative = true }
6+
PYO3_PYTHON = { value = ".pixi/envs/default/bin/python3", relative = true }
7+
8+
[target.x86_64-pc-windows-msvc]
9+
rustflags = ["-C", "target-feature=+crt-static,+avx2"]
10+
11+
[target.x86_64-apple-darwin]
12+
rustflags = ["-C", "target-feature=+avx2"]
13+
14+
[target.'cfg(all())']
15+
rustflags = [
16+
"-Wclippy::all",
17+
"-Wclippy::await_holding_lock",
18+
"-Wclippy::char_lit_as_u8",
19+
"-Wclippy::checked_conversions",
20+
"-Wclippy::dbg_macro",
21+
"-Wclippy::debug_assert_with_mut_call",
22+
"-Wclippy::doc_markdown",
23+
"-Wclippy::empty_enum",
24+
"-Wclippy::enum_glob_use",
25+
"-Wclippy::expl_impl_clone_on_copy",
26+
"-Wclippy::explicit_deref_methods",
27+
"-Wclippy::explicit_into_iter_loop",
28+
"-Wclippy::fallible_impl_from",
29+
"-Wclippy::filter_map_next",
30+
"-Wclippy::flat_map_option",
31+
"-Wclippy::float_cmp_const",
32+
"-Wclippy::fn_params_excessive_bools",
33+
"-Wclippy::from_iter_instead_of_collect",
34+
"-Wclippy::if_let_mutex",
35+
"-Wclippy::implicit_clone",
36+
"-Wclippy::imprecise_flops",
37+
"-Wclippy::inefficient_to_string",
38+
"-Wclippy::invalid_upcast_comparisons",
39+
"-Wclippy::large_digit_groups",
40+
"-Wclippy::large_stack_arrays",
41+
"-Wclippy::large_types_passed_by_value",
42+
"-Wclippy::let_unit_value",
43+
"-Wclippy::linkedlist",
44+
"-Wclippy::lossy_float_literal",
45+
"-Wclippy::macro_use_imports",
46+
"-Wclippy::manual_ok_or",
47+
"-Wclippy::map_flatten",
48+
"-Wclippy::map_unwrap_or",
49+
"-Wclippy::match_on_vec_items",
50+
"-Wclippy::match_same_arms",
51+
"-Wclippy::match_wild_err_arm",
52+
"-Wclippy::match_wildcard_for_single_variants",
53+
"-Wclippy::mem_forget",
54+
"-Wclippy::mismatched_target_os",
55+
"-Wclippy::missing_enforced_import_renames",
56+
"-Wclippy::mut_mut",
57+
"-Wclippy::mutex_integer",
58+
"-Wclippy::needless_borrow",
59+
"-Wclippy::needless_continue",
60+
"-Wclippy::needless_for_each",
61+
"-Wclippy::option_option",
62+
"-Wclippy::path_buf_push_overwrite",
63+
"-Wclippy::ptr_as_ptr",
64+
"-Wclippy::rc_mutex",
65+
"-Wclippy::ref_option_ref",
66+
"-Wclippy::rest_pat_in_fully_bound_structs",
67+
"-Wclippy::same_functions_in_if_condition",
68+
"-Wclippy::semicolon_if_nothing_returned",
69+
"-Wclippy::single_match_else",
70+
"-Wclippy::string_add_assign",
71+
"-Wclippy::string_add",
72+
"-Wclippy::string_lit_as_bytes",
73+
"-Wclippy::string_to_string",
74+
"-Wclippy::todo",
75+
"-Wclippy::trait_duplication_in_bounds",
76+
"-Wclippy::unimplemented",
77+
"-Wclippy::unnested_or_patterns",
78+
"-Wclippy::unused_self",
79+
"-Wclippy::useless_transmute",
80+
"-Wclippy::verbose_file_reads",
81+
"-Wclippy::zero_sized_map_values",
82+
"-Wfuture_incompatible",
83+
"-Wnonstandard_style",
84+
]

rust/.gitattributes renamed to .gitattributes

File renamed without changes.

rust/.github/workflows/CI.yml renamed to .github/workflows/Wheels.yml

File renamed without changes.

‎.github/workflows/vcpkg-build.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ jobs:
3939
uses: actions/cache@v4
4040
with:
4141
path: |
42-
deps/vcpkg/vcpkg
43-
deps/vcpkg/vcpkg.exe
44-
key: ${{ runner.os }}-${{ hashFiles('deps/vcpkg/bootstrap.cmake') }}
42+
cpp/deps/vcpkg/vcpkg
43+
cpp/deps/vcpkg/vcpkg.exe
44+
key: ${{ runner.os }}-${{ hashFiles('cpp/deps/vcpkg/bootstrap.cmake') }}
4545
- name: Cache vcpkg packages
4646
id: cache-vcpkg
4747
uses: actions/cache@v4
@@ -51,6 +51,8 @@ jobs:
5151
~/AppData/Local/vcpkg/archives
5252
key: ${{ runner.os }}-${{ matrix.cfg.triplet }}-${{ hashFiles('vcpkg.json', '.git/modules/deps/vcpkg/shallow') }}
5353
- name: Bootstrap the ports
54+
working-directory: ./app
5455
run: python bootstrap.py --triplet ${{ matrix.cfg.triplet }} --clean-after-build
5556
- name: Build the code
57+
working-directory: ./app
5658
run: python build.py --triplet ${{ matrix.cfg.triplet }} --no-avx2 --python-path '${{ steps.setup-python.outputs.python-path }}' --run-tests

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ compile_commands.json
2222
.DS_Store
2323
vcpkg_installed
2424
standalone
25+
target

‎.gitmodules‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
[submodule "deps/infra"]
2-
path = deps/infra
3-
url = https://github.com/VITObelgium/cpp-infra.git
4-
[submodule "deps/vcpkg"]
5-
path = deps/vcpkg
6-
url = https://github.com/VITObelgium/vcpkg-ports.git
1+
[submodule "cpp/deps/infra"]
2+
path = cpp/deps/infra
3+
url = [email protected]:VITObelgium/cpp-infra.git
4+
[submodule "cpp/deps/vcpkg"]
5+
path = cpp/deps/vcpkg
6+
url = [email protected]:VITObelgium/vcpkg-ports.git
7+
[submodule "infra-rs"]
8+
path = infra-rs
9+
url = https://git.vito.be/scm/marvin/infra-rs.git

‎.vscode/c_cpp_properties.json‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎.vscode/launch.json‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,5 @@
33
// Hover to view descriptions of existing attributes.
44
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
55
"version": "0.2.0",
6-
"configurations": [
7-
{
8-
"name": "(lldb) Launch",
9-
"type": "cppdbg",
10-
"request": "launch",
11-
"program": "${command:cmake.launchTargetPath}",
12-
"args": [],
13-
"stopAtEntry": false,
14-
"cwd": "${workspaceFolder}/build/vscode",
15-
"environment": [],
16-
"externalConsole": true,
17-
"MIMode": "lldb"
18-
}
19-
]
6+
"configurations": []
207
}

‎.vscode/settings.json‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@
77
"**/deps/vcpkg/buildtrees": true,
88
"**/deps/vcpkg/packages": true,
99
},
10-
"python.autoComplete.extraPaths": [
11-
"${workspaceRoot}/build/gdx/Release"
12-
],
13-
"python.linting.pylintArgs": [
14-
"--init-hook='import sys; sys.path.append(\"${workspaceRoot}/build/gdx/Release\")'"
15-
],
1610
"C_Cpp.autocomplete": "Disabled",
1711
"C_Cpp.formatting": "Disabled",
1812
"C_Cpp.errorSquiggles": "Disabled",
@@ -25,8 +19,5 @@
2519
"cmake.copyCompileCommands": "${workspaceRoot}/compile_commands.json",
2620
"clangd.arguments": [
2721
"-header-insertion=never"
28-
],
29-
"python.analysis.extraPaths": [
30-
"${workspaceRoot}/build/gdx/Release"
3122
]
3223
}

‎.vscode/tasks.json‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,38 @@
11
{
2-
// See https://go.microsoft.com/fwlink/?LinkId=733558
3-
// for the documentation about the tasks.json format
42
"version": "2.0.0",
5-
"tasks": []
3+
"tasks": [
4+
{
5+
"type": "process",
6+
"command": "pixi",
7+
"problemMatcher": [
8+
"$rustc"
9+
],
10+
"args": [
11+
"run",
12+
"maturin",
13+
"develop"
14+
],
15+
"group": {
16+
"kind": "build",
17+
"isDefault": true
18+
},
19+
"label": "rust: maturin develop"
20+
},
21+
{
22+
"type": "process",
23+
"command": "pixi",
24+
"problemMatcher": [
25+
"$rustc"
26+
],
27+
"args": [
28+
"run",
29+
"test"
30+
],
31+
"group": {
32+
"kind": "test",
33+
"isDefault": true
34+
},
35+
"label": "rust: maturin test"
36+
}
37+
]
638
}

0 commit comments

Comments
 (0)