Skip to content

Commit d085b8e

Browse files
KixironJoshua Nelson
authored andcommitted
Don't manually escape names
1 parent b789f1c commit d085b8e

File tree

6 files changed

+12
-29
lines changed

6 files changed

+12
-29
lines changed

templates/core/home.html

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,10 @@ <h1 class="brand"><i class="fa fa-cubes fa-fw"></i> Docs.rs</h1>
3434

3535
<ul>
3636
{%- for release in recent_releases -%}
37-
{# FIXME: https://github.com/Keats/tera/issues/539 #}
38-
{%- set name = release.name | escape -%}
39-
{%- set version = release.version | escape -%}
4037
{%- if release.rustdoc_status -%}
41-
{%- set release_url = "/" ~ name ~ "/" ~ version ~ "/" ~ release.target_name -%}
38+
{%- set release_url = "/" ~ release.name ~ "/" ~ release.version ~ "/" ~ release.target_name -%}
4239
{%- else -%}
43-
{%- set release_url = "/crate/" ~ name ~ "/" ~ version -%}
40+
{%- set release_url = "/crate/" ~ release.name ~ "/" ~ release.version -%}
4441
{%- endif -%}
4542

4643
<li>

templates/header/package_navigation.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,7 @@ <h1 id="crate-title">
5454

5555
<ul class="pure-menu-list">
5656
{# The partial path of the crate, `:name/:release` #}
57-
{# FIXME: https://github.com/Keats/tera/issues/539 #}
58-
{%- set name = metadata.name | escape -%}
59-
{%- set version = metadata.version | escape -%}
60-
{%- set crate_path = name ~ "/" ~ version -%}
57+
{%- set crate_path = metadata.name ~ "/" ~ metadata.version -%}
6158

6259
{# If docs are built, show a tab for them #}
6360
{%- if metadata.rustdoc_status -%}

templates/macros.html

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,9 @@
8888
{% macro releases_list(name, releases) %}
8989
{%- for release in releases -%}
9090
{# The url for the release, `/crate/:name/:version` #}
91-
{# FIXME: https://github.com/Keats/tera/issues/539 #}
92-
{%- set name = name | escape -%}
93-
{%- set version = release.version | escape -%}
94-
{%- set release_url = "/crate/" ~ name ~ "/" ~ version -%}
91+
{%- set release_url = "/crate/" ~ name ~ "/" ~ release.version -%}
9592
{# The release's name and version, `:name-:version` #}
96-
{%- set release_name = name ~ "-" ~ version -%}
93+
{%- set release_name = name ~ "-" ~ release.version -%}
9794

9895
<li class="pure-menu-item">
9996
{# If the release isn't a library, then display that warning #}

templates/releases/feed.xml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,17 @@
1212
<updated>{{ recent_releases[0].release_time | default(value=now()) | date(format="%+") }}</updated>
1313

1414
{%- for release in recent_releases -%}
15-
{# FIXME: https://github.com/Keats/tera/issues/539 #}
16-
{%- set name = release.name | escape_xml -%}
17-
{%- set version = release.version | escape_xml -%}
1815
{%- if release.rustdoc_status -%}
19-
{%- set link = "/" ~ name ~ "/" ~ version ~ "/" ~ release.target_name -%}
16+
{%- set link = "/" ~ release.name ~ "/" ~ release.version ~ "/" ~ release.target_name -%}
2017
{%- else -%}
21-
{%- set link = "/crate/" ~ name ~ "/" ~ version -%}
18+
{%- set link = "/crate/" ~ release.name ~ "/" ~ release.version -%}
2219
{%- endif %}
2320

2421
<entry>
25-
<title>{{ name }}-{{ version }}</title>
22+
<title>{{ release.name }}-{{ version }}</title>
2623

2724
<link href="{{ link | safe }}" />
28-
<id>urn:docs-rs:{{ name }}:{{ version }}</id>
25+
<id>urn:docs-rs:{{ release.name }}:{{ version }}</id>
2926
<updated>{{ release.release_time | date(format="%+") }}</updated>
3027

3128
<summary>

templates/releases/releases.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@
2121
<ul>
2222
{# TODO: If there are no releases, then display a message that says so #}
2323
{%- for release in releases -%}
24-
{%- set name = release.name | escape -%}
25-
{%- set version = release.version | escape -%}
2624
{%- if release.rustdoc_status -%}
27-
{% set link = "/" ~ name ~ "/" ~ version ~ "/" ~ release.target_name -%}
25+
{% set link = "/" ~ release.name ~ "/" ~ release.version ~ "/" ~ release.target_name -%}
2826
{%- else -%}
29-
{% set link = "/crate/" ~ name ~ "/" ~ version -%}
27+
{% set link = "/crate/" ~ release.name ~ "/" ~ release.version -%}
3028
{%- endif -%}
3129

3230
<li>

templates/rustdoc/body.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
{%- import "macros.html" as macros -%}
22

33
{# The url of the current release, `/crate/:name/:version` #}
4-
{# FIXME: https://github.com/Keats/tera/issues/539 #}
5-
{%- set name = krate.name | escape -%}
6-
{%- set version = krate.version | escape -%}
7-
{%- set crate_url = "/crate/" ~ name ~ "/" ~ version -%}
4+
{%- set crate_url = "/crate/" ~ krate.name ~ "/" ~ krate.version -%}
85

96
<div class="nav-container nav-container-rustdoc">
107
<div class="container-rustdoc rustdoc-navigation">

0 commit comments

Comments
 (0)