itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: wrong concat and field name (#15074)

Browse Source 
### What does this PR try to resolve?

Fixes a wrong concatenation in macro, and one wrong field name.

### How should we test and review this PR?

`cargo doc --document-private-items --no-deps --open`
This commit is contained in:
Ed Page 2025-01-16 20:22:34 +00:00 committed by GitHub
commit dc0d02a1fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cargo/util/toml/mod.rs
View File

@ -869,7 +869,7 @@ fn inheritable_from_path(
macro_rules! package_field_getter { macro_rules! package_field_getter {
( $(($key:literal, $field:ident -> $ret:ty),)* ) => ( ( $(($key:literal, $field:ident -> $ret:ty),)* ) => (
$( $(
#[doc = concat!("Gets the field `workspace.package", $key, "`.")] #[doc = concat!("Gets the field `workspace.package.", $key, "`.")]
fn $field(&self) -> CargoResult<$ret> { fn $field(&self) -> CargoResult<$ret> {
let Some(val) = self.package.as_ref().and_then(|p| p.$field.as_ref()) else { let Some(val) = self.package.as_ref().and_then(|p| p.$field.as_ref()) else {
bail!("`workspace.package.{}` was not defined", $key); bail!("`workspace.package.{}` was not defined", $key);
@ -940,7 +940,7 @@ impl InheritableFields {
Ok(dep) Ok(dep)
} }
/// Gets the field `workspace.lint`. /// Gets the field `workspace.lints`.
pub fn lints(&self) -> CargoResult<manifest::TomlLints> { pub fn lints(&self) -> CargoResult<manifest::TomlLints> {
let Some(val) = &self.lints else { let Some(val) = &self.lints else {
bail!("`workspace.lints` was not defined"); bail!("`workspace.lints` was not defined");