s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: Use meson_Cargo.toml.in for setting up the build

Browse Source 
to make rust-analyzer work correctly.

When the paths in Cargo.toml have '@path@' in them,
rust-analyzer cannot find the correct paths.

Before this change, rust-analyzer was unable to offer information
about code (in files other than main.rs), and instead
showed an error-message:
"1:1 unused: This file is not included anywhere in the module tree,
so rust-analyzer can't offer IDE services.".

Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/657>
This commit is contained in:
MoonlightWave-12
2024-08-03 10:34:34 +02:00
committed by Marge Bot
parent 0b83eb7d9f
commit 0403fe4cde
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.toml
View File

@ -5,21 +5,21 @@ edition = "2021"
[lib] [lib]
name = "rs" name = "rs"
path = "@path@/src/lib.rs" path = "src/lib.rs"
crate-type = ["staticlib", "rlib"] crate-type = ["staticlib", "rlib"]
# Cargo can't do autodiscovery if Cargo.toml is not in the root. # Cargo can't do autodiscovery if Cargo.toml is not in the root.
[[bin]] [[bin]]
name = "test_layout" name = "test_layout"
path = "@path@/src/bin/test_layout.rs" path = "src/bin/test_layout.rs"
[[example]] [[example]]
name = "test_layout" name = "test_layout"
path = "@path@/examples/test_layout.rs" path = "examples/test_layout.rs"
[[example]] [[example]]
name = "find_orphan_layouts" name = "find_orphan_layouts"
path = "@path@/examples/find_orphan_layouts.rs" path = "examples/find_orphan_layouts.rs"
[features] [features]
zbus_v1_5 = [] zbus_v1_5 = []

8
meson.build
View File

@ -85,10 +85,16 @@ summary = [
] ]
message('\n'.join(summary)) message('\n'.join(summary))
# 'rust-analyzer' does not work correctly, when the paths in 'Cargo.toml' have '@path@' in them.
cp = find_program('cp')
sed = find_program('sed')
copy_cargo_toml = run_command('cp', 'Cargo.toml', 'meson_Cargo.toml.in')
prepare_cargo_toml = run_command('sed', '-i', 's/path = "/path = "@path@\//', 'meson_Cargo.toml.in')
path_data = configuration_data() path_data = configuration_data()
path_data.set('path', meson.source_root()) path_data.set('path', meson.source_root())
cargo_toml = configure_file( cargo_toml = configure_file(
input: 'Cargo.toml', input: 'meson_Cargo.toml.in',
output: 'Cargo.toml', output: 'Cargo.toml',
configuration: path_data, configuration: path_data,
) )