Skip to content

Commit daf8f3b

Browse files
author
Ridwan Abdilahi
committed
Respond to PR comments. Fix unused variables warnings.
1 parent 046464d commit daf8f3b

File tree

2 files changed

+46
-34
lines changed

2 files changed

+46
-34
lines changed

‎debug_metadata/url.natvis

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
3-
<Type Name="url::Url">
4-
<Intrinsic Name="ptr" Expression="serialization.vec.buf.ptr.pointer.pointer" />
5-
<DisplayString>{serialization}</DisplayString>
6-
<Expand>
7-
<Synthetic Name="[scheme]">
8-
<DisplayString>{(char*)(ptr()),[scheme_end]s8}</DisplayString>
9-
</Synthetic>
10-
<Synthetic Name="[username]" Condition="username_end > (scheme_end + 3)">
11-
<!-- Add 3 to the scheme end to account for the scheme separator which is '://' -->
12-
<DisplayString>{(char*)(ptr()+(scheme_end + 3)),[((username_end)-(scheme_end + 3))]s8}</DisplayString>
13-
</Synthetic>
14-
<Synthetic Name="[host]" Condition="host.discriminant != 0">
15-
<DisplayString>{(char*)(ptr()+host_start),[host_end-host_start]s8}</DisplayString>
16-
</Synthetic>
17-
<Synthetic Name="[port]" Condition="port.discriminant == 1">
18-
<DisplayString>{port.variant1.__0,d}</DisplayString>
19-
</Synthetic>
20-
<Synthetic Name="[path]">
21-
<DisplayString Condition="query_start.discriminant == 0 &amp;&amp; fragment_start.discriminant == 0">{(char*)(ptr()+path_start),[(serialization.vec.len-path_start)]s8}</DisplayString>
22-
<DisplayString Condition="query_start.discriminant == 1">{(char*)(ptr()+path_start),[(query_start.variant1.__0-path_start)]s8}</DisplayString>
23-
<DisplayString Condition="fragment_start.discriminant == 1">{(char*)(ptr()+path_start),[(fragment_start.variant1.__0-path_start)]s8}</DisplayString>
24-
</Synthetic>
25-
<Synthetic Name="[query]" Condition="query_start.discriminant == 1">
26-
<DisplayString Condition="fragment_start.discriminant == 0">{(char*)(ptr()+query_start.variant1.__0+1),[((serialization.vec.len)-(query_start.variant1.__0+1))]s8}</DisplayString>
27-
<DisplayString Condition="fragment_start.discriminant == 1">{(char*)(ptr()+query_start.variant1.__0+1),[((fragment_start.variant1.__0)-(query_start.variant1.__0+1))]s8}</DisplayString>
28-
</Synthetic>
29-
<Synthetic Name="[fragment]" Condition="fragment_start.discriminant == 1">
30-
<DisplayString>{(char*)(ptr()+fragment_start.variant1.__0+1),[(serialization.vec.len-fragment_start.variant1.__0-1)]s8}</DisplayString>
31-
</Synthetic>
32-
</Expand>
33-
</Type>
34-
</AutoVisualizer>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
3+
<Type Name="url::Url">
4+
<Intrinsic Name="ptr" Expression="serialization.vec.buf.ptr.pointer.pointer" />
5+
<DisplayString>{serialization}</DisplayString>
6+
<Expand>
7+
<Synthetic Name="[scheme]">
8+
<DisplayString>{(char*)(ptr()),[scheme_end]s8}</DisplayString>
9+
</Synthetic>
10+
<Synthetic Name="[username]" Condition="username_end > (scheme_end + 3)">
11+
<!-- Add 3 to the scheme end to account for the scheme separator which is '://' -->
12+
<DisplayString>{(char*)(ptr()+(scheme_end + 3)),[((username_end)-(scheme_end + 3))]s8}</DisplayString>
13+
</Synthetic>
14+
<Synthetic Name="[host]" Condition="host.discriminant != 0">
15+
<DisplayString>{(char*)(ptr()+host_start),[host_end-host_start]s8}</DisplayString>
16+
</Synthetic>
17+
<Synthetic Name="[port]" Condition="port.discriminant == 1">
18+
<DisplayString>{port.variant1.__0,d}</DisplayString>
19+
</Synthetic>
20+
<Synthetic Name="[path]">
21+
<DisplayString Condition="query_start.discriminant == 0 &amp;&amp; fragment_start.discriminant == 0">{(char*)(ptr()+path_start),[(serialization.vec.len-path_start)]s8}</DisplayString>
22+
<DisplayString Condition="query_start.discriminant == 1">{(char*)(ptr()+path_start),[(query_start.variant1.__0-path_start)]s8}</DisplayString>
23+
<DisplayString Condition="fragment_start.discriminant == 1">{(char*)(ptr()+path_start),[(fragment_start.variant1.__0-path_start)]s8}</DisplayString>
24+
</Synthetic>
25+
<Synthetic Name="[query]" Condition="query_start.discriminant == 1">
26+
<DisplayString Condition="fragment_start.discriminant == 0">{(char*)(ptr()+query_start.variant1.__0+1),[((serialization.vec.len)-(query_start.variant1.__0+1))]s8}</DisplayString>
27+
<DisplayString Condition="fragment_start.discriminant == 1">{(char*)(ptr()+query_start.variant1.__0+1),[((fragment_start.variant1.__0)-(query_start.variant1.__0+1))]s8}</DisplayString>
28+
</Synthetic>
29+
<Synthetic Name="[fragment]" Condition="fragment_start.discriminant == 1">
30+
<DisplayString>{(char*)(ptr()+fragment_start.variant1.__0+1),[(serialization.vec.len-fragment_start.variant1.__0-1)]s8}</DisplayString>
31+
</Synthetic>
32+
</Expand>
33+
</Type>
34+
</AutoVisualizer>

‎url/tests/debugger_visualizer.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,26 @@ fn __break() {}
7474
fn test_url_visualizer() {
7575
// Copied from https://github.com/web-platform-tests/wpt/blob/master/url/
7676
let base_url = Url::parse("http://example.org/foo/bar").unwrap();
77+
assert_eq!(base_url.as_str(), "http://example.org/foo/bar");
78+
7779
let url_with_non_special_scheme = Url::parse("non-special://:@test/x").unwrap();
80+
assert_eq!(url_with_non_special_scheme.as_str(), "non-special://test/x");
81+
7882
let url_with_user_pass_port_query_fragments =
7983
Url::parse("http://user:pass@foo:21/bar;par?b#c").unwrap();
84+
assert_eq!(url_with_user_pass_port_query_fragments.as_str(), "http://user:pass@foo:21/bar;par?b#c");
85+
8086
let url_blob = Url::parse("blob:https://example.com:443/").unwrap();
87+
assert_eq!(url_blob.as_str(), "blob:https://example.com:443/");
88+
8189
let url_with_base = base_url.join("/a%2fc").unwrap();
90+
assert_eq!(url_with_base.as_str(), "http://example.org/a%2fc");
91+
8292
let url_with_base_replaced = base_url.join("http://[::127.0.0.1]").unwrap();
93+
assert_eq!(url_with_base_replaced.as_str(), "http://[::7f00:1]/");
8394

8495
let url_with_comma = base_url.join("data:text/html,test#test").unwrap();
96+
assert_eq!(url_with_comma.as_str(), "data:text/html,test#test");
8597

8698
__break();
8799
}

0 commit comments

Comments
 (0)