diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-05 18:01:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-05 18:01:07 +0000 |
commit | 933da575d4612c93508de754f50149e278572caf (patch) | |
tree | ce0abef0ed1c3acb4da7a429386c6ce4d06c432e /doc | |
parent | 2663e5b623f6bbe6155a8d79b5996e4c27f42d8f (diff) | |
parent | 0a9e90389a5ec16788322974587ec154ea810270 (diff) | |
download | nixlib-933da575d4612c93508de754f50149e278572caf.tar nixlib-933da575d4612c93508de754f50149e278572caf.tar.gz nixlib-933da575d4612c93508de754f50149e278572caf.tar.bz2 nixlib-933da575d4612c93508de754f50149e278572caf.tar.lz nixlib-933da575d4612c93508de754f50149e278572caf.tar.xz nixlib-933da575d4612c93508de754f50149e278572caf.tar.zst nixlib-933da575d4612c93508de754f50149e278572caf.zip |
Merge master into staging-next
Diffstat (limited to 'doc')
-rw-r--r-- | doc/languages-frameworks/rust.section.md | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index f2f3502550e5..7959685af6d5 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -454,7 +454,7 @@ you of the correct hash. * `maturinBuildHook`: use [Maturin](https://github.com/PyO3/maturin) to build a Python wheel. Similar to `cargoBuildHook`, the optional variable `buildAndTestSubdir` can be used to build a crate in a - Cargo workspace. Additional maturin flags can be passed through + Cargo workspace. Additional Maturin flags can be passed through `maturinBuildFlags`. * `cargoCheckHook`: run tests using Cargo. The build type for checks can be set using `cargoCheckType`. Features can be specified with @@ -476,7 +476,7 @@ dependencies. The build itself is then performed by The following example outlines how the `tokenizers` Python package is built. Since the Python package is in the `source/bindings/python` -directory of the *tokenizers* project's source archive, we use +directory of the `tokenizers` project's source archive, we use `sourceRoot` to point the tooling to this directory: ```nix @@ -758,7 +758,7 @@ with import <nixpkgs> {}; Actually, the overrides introduced in the previous section are more general. A number of other parameters can be overridden: -- The version of rustc used to compile the crate: +- The version of `rustc` used to compile the crate: ```nix (hello {}).override { rust = pkgs.rust; }; @@ -771,7 +771,7 @@ general. A number of other parameters can be overridden: (hello {}).override { release = false; }; ``` -- Whether to print the commands sent to rustc when building +- Whether to print the commands sent to `rustc` when building (equivalent to `--verbose` in cargo: ```nix @@ -912,11 +912,11 @@ detailed usage. Fenix is an alternative to `rustup` and can also be used as an overlay. -Both Oxalica's overlay and fenix better integrate with nix and cache optimizations. +Both oxalica's overlay and fenix better integrate with nix and cache optimizations. Because of this and ergonomics, either of those community projects -should be preferred to the Mozilla's Rust overlay (nixpkgs-mozilla). +should be preferred to the Mozilla's Rust overlay (`nixpkgs-mozilla`). -### How to select a specific rustc and toolchain version {#how-to-select-a-specific-rustc-and-toolchain-version} +### How to select a specific `rustc` and toolchain version {#how-to-select-a-specific-rustc-and-toolchain-version} You can consume the oxalica overlay and use it to grab a specific Rust toolchain version. Here is an example `shell.nix` showing how to grab the current stable toolchain: |