diff --git a/Cargo.toml b/Cargo.toml index 344d3c4c..cf94f4f8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,21 +5,21 @@ edition = "2021" [lib] name = "rs" -path = "@path@/src/lib.rs" +path = "src/lib.rs" crate-type = ["staticlib", "rlib"] # Cargo can't do autodiscovery if Cargo.toml is not in the root. [[bin]] name = "test_layout" -path = "@path@/src/bin/test_layout.rs" +path = "src/bin/test_layout.rs" [[example]] name = "test_layout" -path = "@path@/examples/test_layout.rs" +path = "examples/test_layout.rs" [[example]] name = "find_orphan_layouts" -path = "@path@/examples/find_orphan_layouts.rs" +path = "examples/find_orphan_layouts.rs" [features] zbus_v1_5 = [] diff --git a/meson.build b/meson.build index bb7d8b37..89ded202 100644 --- a/meson.build +++ b/meson.build @@ -85,10 +85,16 @@ 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.set('path', meson.source_root()) cargo_toml = configure_file( - input: 'Cargo.toml', + input: 'meson_Cargo.toml.in', output: 'Cargo.toml', configuration: path_data, )