Browse Source

revert commit d30faec6821f15ddb3ce8ae29fba2bc646fbd25e

apiraino 4 years ago
parent
commit
9261ae944c
2 changed files with 9 additions and 9 deletions
  1. 3 3
      templates/_issues.tt
  2. 6 6
      templates/prioritization_agenda.tt

+ 3 - 3
templates/_issues.tt

@@ -1,7 +1,7 @@
 {% import "_issue.tt" as issue %}
 
-{% macro render(issues, indent="", newline_and_indent=true, empty="No issues this time.") %}
+{% macro render(issues, indent="", empty="No issues this time.") %}
 {%- for issue in issues %}
-{{indent}}- {{issue::render(issue=issue)}}{% else %}{% if newline_and_indent %}
-{{indent}}- {% endif %}{{empty}}{% endfor -%}
+{{indent}}- {{issue::render(issue=issue)}}{% else %}
+{{indent}}- {{empty}}{% endfor -%}
 {% endmacro %}

+ 6 - 6
templates/prioritization_agenda.tt

@@ -15,18 +15,18 @@ tags: weekly, rustc
 - Old MCPs (not seconded, take a look)
 {{-issues::render(issues=mcp_old_not_seconded, indent="  ", empty="No old proposals this time.")}}
 - Pending FCP requests (check your boxes!)
-{{-issues::render(issues=in_pre_fcp_compiler_team, indent="", newline_and_indent=false, empty="")}}
-{{-issues::render(issues=in_pre_fcp_rust, indent="", newline_and_indent=false, empty="")}}
+{{-issues::render(issues=in_pre_fcp_compiler_team, indent="  ", empty="No pending FCP requests this time.")}}
+{{-issues::render(issues=in_pre_fcp_rust, indent="  ", empty="No pending FCP requests this time.")}}
 {{-issues::render(issues=in_pre_fcp_forge, indent="  ", empty="No pending FCP requests this time.")}}
 - Things in FCP (make sure you're good with it)
-{{-issues::render(issues=in_fcp_compiler_team, indent="", newline_and_indent=false, empty="")}}
-{{-issues::render(issues=in_fcp_rust, indent="", newline_and_indent=false, empty="")}}
+{{-issues::render(issues=in_fcp_compiler_team, indent="  ", empty="No FCP requests this time.")}}
+{{-issues::render(issues=in_fcp_rust, indent="  ", empty="No FCP requests this time.")}}
 {{-issues::render(issues=in_fcp_forge, indent="  ", empty="No FCP requests this time.")}}
 - Accepted MCPs
 {{-issues::render(issues=mcp_accepted, indent="  ", empty="No new accepted proposals this time.")}}
 - Finalized FCPs (disposition merge)
-{{-issues::render(issues=fcp_finished_compiler_team, indent="", newline_and_indent=false, empty="")}}
-{{-issues::render(issues=fcp_finished_rust, indent="", newline_and_indent=false, empty="")}}
+{{-issues::render(issues=fcp_finished_compiler_team, indent="  ", empty="No new finished FCP (disposition merge) this time.")}}
+{{-issues::render(issues=fcp_finished_rust, indent="  ", empty="No new finished FCP (disposition merge) this time.")}}
 {{-issues::render(issues=fcp_finished_forge, indent="  ", empty="No new finished FCP (disposition merge) this time.")}}
 
 ### WG checkins