From 5d81cf78f827c2f232607a38a5b90b6ab3dd01dc Mon Sep 17 00:00:00 2001 From: Dorota Czaplejewicz Date: Mon, 19 Oct 2020 14:33:08 +0000 Subject: [PATCH] docs: Correct Cargo update instructions --- doc/hacking.md | 5 ++++- meson.build | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/hacking.md b/doc/hacking.md index d8c37811..ea3e452e 100644 --- a/doc/hacking.md +++ b/doc/hacking.md @@ -179,7 +179,10 @@ Dependencies must be specified in `Cargo.toml` with 2 numbers: "major.minor". Si ``` cd build_dir -ninja build src/Cargo.toml +ninja ./Cargo.toml sh /source_path/cargo.sh update ninja test +cp ./Cargo.lock /source_path/ ``` + +Since version 1.9.3, `Cargo.lock` is not actually used by the build system, due to `Cargo.toml` being generated at every build. diff --git a/meson.build b/meson.build index a7b10501..70b1134f 100644 --- a/meson.build +++ b/meson.build @@ -71,6 +71,7 @@ summary = [ message('\n'.join(summary)) # Rust deps are changing, depending on compile flags. Cargo can't handle it alone. +# As a side effect, Cargo.toml never gets used. cargo_toml_in = files('Cargo.toml.in') path_data = configuration_data() path_data.set('path', meson.source_root())