- CHANGELOG.md:v2.8.0 条目(中英双语); - README.md:版本行 2.7.1→2.8.0 + 愿景第 6 条(知识可证明); - doc/releases/v2.8.0.md:双语发版说明(亮点/用法/已知限制); - skills/marqdo-dev/index.mq.md:新增 prove 任务(路径/目录模式/ require_lean/json;参数用 + 行声明升参,check 与 narrative-ratio 通过); - 设计文档 §12.5 标记已合入;发版链接统一指向 doc/releases/v2.8.0.md。
19 lines
831 B
Diff
Executable File
19 lines
831 B
Diff
Executable File
Description: Use stable Option map_or in the engineering release boundary
|
|
Author: Marqdo Maintainers <cflmy@users.noreply.github.com>
|
|
Forwarded: not-needed
|
|
Last-Update: 2026-11-10
|
|
|
|
diff --git a/plugins/engineering/src/lib.rs b/plugins/engineering/src/lib.rs
|
|
index 6891f01..f0c5ffc 100644
|
|
--- a/plugins/engineering/src/lib.rs
|
|
+++ b/plugins/engineering/src/lib.rs
|
|
@@ -283,7 +283,7 @@ fn r2_settings(root:&Path)->Result<BTreeMap<String,String>,String> {
|
|
}
|
|
}
|
|
for k in ["R2_ENDPOINT","R2_BUCKET","R2_ACCESS_KEY_ID","R2_SECRET_ACCESS_KEY"] {
|
|
- if settings.get(k).is_none_or(String::is_empty) {return Err(format!("missing {k}; configure ~/.marqdo/r2.env"));}
|
|
+ if settings.get(k).map_or(true, String::is_empty) {return Err(format!("missing {k}; configure ~/.marqdo/r2.env"));}
|
|
}
|
|
Ok(settings)
|
|
}
|