Commit d682af8

Browse files
borsbors
committed
Auto merge of #147918 - yotamofek:pr/stringdex-fork, r=GuillaumeGomez
Upgrade `stringdex` to 0.0.3 Includes a bunch of optimizations for a nice perf win
2 parents 5dbf406 + e921e28 commit d682af8

3 files changed

Lines changed: 53 additions & 44 deletions

File tree

‎Cargo.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
12891289
checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
12901290
dependencies = [
12911291
"libc",
1292-
"windows-sys 0.52.0",
1292+
"windows-sys 0.60.2",
12931293
]
12941294

12951295
[[package]]
@@ -2155,7 +2155,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
21552155
checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
21562156
dependencies = [
21572157
"cfg-if",
2158-
"windows-targets 0.52.6",
2158+
"windows-targets 0.53.3",
21592159
]
21602160

21612161
[[package]]
@@ -4907,7 +4907,7 @@ dependencies = [
49074907
"errno",
49084908
"libc",
49094909
"linux-raw-sys",
4910-
"windows-sys 0.52.0",
4910+
"windows-sys 0.61.2",
49114911
]
49124912

49134913
[[package]]
@@ -5275,9 +5275,9 @@ dependencies = [
52755275

52765276
[[package]]
52775277
name = "stringdex"
5278-
version = "0.0.2"
5278+
version = "0.0.3"
52795279
source = "registry+https://github.com/rust-lang/crates.io-index"
5280-
checksum = "18b3bd4f10d15ef859c40291769f0d85209de6b0f1c30713ff9cdf45ac43ea36"
5280+
checksum = "556a6126952cb2f5150057c98a77cc6c771027dea2825bf7fa03d3d638b0a4f8"
52815281
dependencies = [
52825282
"stacker",
52835283
]

‎src/librustdoc/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ rustdoc-json-types = { path = "../rustdoc-json-types" }
2121
serde = { version = "1.0", features = ["derive"] }
2222
serde_json = "1.0"
2323
smallvec = "1.8.1"
24-
stringdex = "=0.0.2"
24+
stringdex = "=0.0.3"
2525
tempfile = "3"
2626
threadpool = "1.8.1"
2727
tikv-jemalloc-sys = { version = "0.6.1", optional = true, features = ['override_allocator_on_supported_platforms'] }

‎src/librustdoc/html/render/search_index.rs‎

Lines changed: 47 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ mod serde;
33

44
use std::collections::BTreeSet;
55
use std::collections::hash_map::Entry;
6+
use std::io;
67
use std::path::Path;
8+
use std::string::FromUtf8Error;
79

810
use::serde::de::{self,Deserializer,Erroras _};
911
use::serde::ser::{SerializeSeq,Serializer};
@@ -95,21 +97,22 @@ impl SerializedSearchIndex {
9597
) -> Result<(),Error>{
9698
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
9799
let column_path = doc_root.join(format!("search.index/{column_name}/"));
100+
101+
letmut consume = |_,cell:&[u8]| {
102+
column.push(String::from_utf8(cell.to_vec())?);
103+
Ok::<_,FromUtf8Error>(())
104+
};
105+
98106
stringdex_internals::read_data_from_disk_column(
99107
root_path,
100108
column_name.as_bytes(),
101109
column_path.clone(),
102-
&mut |_id, item| {
103-
column.push(String::from_utf8(item.to_vec())?);
104-
Ok(())
105-
},
106-
)
107-
.map_err(
108-
|error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
109-
file: column_path,
110-
error:format!("failed to read column from disk: {error}"),
111-
},
110+
&mut consume,
112111
)
112+
.map_err(|error| Error{
113+
file: column_path,
114+
error:format!("failed to read column from disk: {error}"),
115+
})
113116
}
114117
fnperform_read_serde(
115118
resource_suffix:&str,
@@ -119,25 +122,26 @@ impl SerializedSearchIndex {
119122
) -> Result<(),Error>{
120123
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
121124
let column_path = doc_root.join(format!("search.index/{column_name}/"));
125+
126+
letmut consume = |_,cell:&[u8]| {
127+
if cell.is_empty(){
128+
column.push(None);
129+
}else{
130+
column.push(Some(serde_json::from_slice(cell)?));
131+
}
132+
Ok::<_, serde_json::Error>(())
133+
};
134+
122135
stringdex_internals::read_data_from_disk_column(
123136
root_path,
124137
column_name.as_bytes(),
125138
column_path.clone(),
126-
&mut |_id, item| {
127-
if item.is_empty(){
128-
column.push(None);
129-
}else{
130-
column.push(Some(serde_json::from_slice(item)?));
131-
}
132-
Ok(())
133-
},
134-
)
135-
.map_err(
136-
|error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
137-
file: column_path,
138-
error:format!("failed to read column from disk: {error}"),
139-
},
139+
&mut consume,
140140
)
141+
.map_err(|error| Error{
142+
file: column_path,
143+
error:format!("failed to read column from disk: {error}"),
144+
})
141145
}
142146
fnperform_read_postings(
143147
resource_suffix:&str,
@@ -147,23 +151,28 @@ impl SerializedSearchIndex {
147151
) -> Result<(),Error>{
148152
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
149153
let column_path = doc_root.join(format!("search.index/{column_name}/"));
154+
155+
fnconsumer(
156+
column:&mutVec<Vec<Vec<u32>>>,
157+
) -> implFnMut(u32,&[u8]) -> io::Result<()>{
158+
|_, cell| {
159+
letmut postings = Vec::new();
160+
encode::read_postings_from_string(&mut postings, cell);
161+
column.push(postings);
162+
Ok(())
163+
}
164+
}
165+
150166
stringdex_internals::read_data_from_disk_column(
151167
root_path,
152168
column_name.as_bytes(),
153169
column_path.clone(),
154-
&mut |_id, buf| {
155-
letmut postings = Vec::new();
156-
encode::read_postings_from_string(&mut postings, buf);
157-
column.push(postings);
158-
Ok(())
159-
},
160-
)
161-
.map_err(
162-
|error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
163-
file: column_path,
164-
error:format!("failed to read column from disk: {error}"),
165-
},
170+
&mutconsumer(column),
166171
)
172+
.map_err(|error| Error{
173+
file: column_path,
174+
error:format!("failed to read column from disk: {error}"),
175+
})
167176
}
168177

169178
assert_eq!(names.len(), path_data.len());
@@ -1055,12 +1064,12 @@ impl Serialize for TypeData {
10551064
letmut buf = Vec::new();
10561065
encode::write_postings_to_string(&self.inverted_function_inputs_index,&mut buf);
10571066
letmut serialized_result = Vec::new();
1058-
stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result);
1067+
stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result).unwrap();
10591068
seq.serialize_element(&str::from_utf8(&serialized_result).unwrap())?;
10601069
buf.clear();
10611070
serialized_result.clear();
10621071
encode::write_postings_to_string(&self.inverted_function_output_index,&mut buf);
1063-
stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result);
1072+
stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result).unwrap();
10641073
seq.serialize_element(&str::from_utf8(&serialized_result).unwrap())?;
10651074
ifself.search_unbox{
10661075
seq.serialize_element(&1)?;

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit d682af8
Browse files
borsbors
committed
Auto merge of #147918 - yotamofek:pr/stringdex-fork, r=GuillaumeGomez
Upgrade `stringdex` to 0.0.3
Includes a bunch of optimizations for a nice perf win
2 parents 5dbf406 + e921e28 commit d682af8
3 files changed
Lines changed: 53 additions & 44 deletions
File tree
‎Cargo.lock‎
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
12891289
checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
12901290
dependencies = [
12911291
"libc",
1292-
"windows-sys 0.52.0",
1292+
"windows-sys 0.60.2",
12931293
]
12941294

12951295
[[package]]
@@ -2155,7 +2155,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
21552155
checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
21562156
dependencies = [
21572157
"cfg-if",
2158-
"windows-targets 0.52.6",
2158+
"windows-targets 0.53.3",
21592159
]
21602160

21612161
[[package]]
@@ -4907,7 +4907,7 @@ dependencies = [
49074907
"errno",
49084908
"libc",
49094909
"linux-raw-sys",
4910-
"windows-sys 0.52.0",
4910+
"windows-sys 0.61.2",
49114911
]
49124912

49134913
[[package]]
@@ -5275,9 +5275,9 @@ dependencies = [
52755275

52765276
[[package]]
52775277
name = "stringdex"
5278-
version = "0.0.2"
5278+
version = "0.0.3"
52795279
source = "registry+https://github.com/rust-lang/crates.io-index"
5280-
checksum = "18b3bd4f10d15ef859c40291769f0d85209de6b0f1c30713ff9cdf45ac43ea36"
5280+
checksum = "556a6126952cb2f5150057c98a77cc6c771027dea2825bf7fa03d3d638b0a4f8"
52815281
dependencies = [
52825282
"stacker",
52835283
]
‎src/librustdoc/Cargo.toml‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ rustdoc-json-types = { path = "../rustdoc-json-types" }
2121
serde = { version = "1.0", features = ["derive"] }
2222
serde_json = "1.0"
2323
smallvec = "1.8.1"
24-
stringdex = "=0.0.2"
24+
stringdex = "=0.0.3"
2525
tempfile = "3"
2626
threadpool = "1.8.1"
2727
tikv-jemalloc-sys = { version = "0.6.1", optional = true, features = ['override_allocator_on_supported_platforms'] }
‎src/librustdoc/html/render/search_index.rs‎
Lines changed: 47 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ mod serde;
33

44
use std::collections::BTreeSet;
55
use std::collections::hash_map::Entry;
6+
use std::io;
67
use std::path::Path;
8+
use std::string::FromUtf8Error;
79

810
use::serde::de::{self,Deserializer,Erroras _};
911
use::serde::ser::{SerializeSeq,Serializer};
@@ -95,21 +97,22 @@ impl SerializedSearchIndex {
9597
) -> Result<(),Error>{
9698
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
9799
let column_path = doc_root.join(format!("search.index/{column_name}/"));
100+
101+
letmut consume = |_,cell:&[u8]| {
102+
 column.push(String::from_utf8(cell.to_vec())?);
103+
Ok::<_,FromUtf8Error>(())
104+
};
105+
98106
 stringdex_internals::read_data_from_disk_column(
99107
 root_path,
100108
 column_name.as_bytes(),
101109
 column_path.clone(),
102-
&mut |_id, item| {
103-
 column.push(String::from_utf8(item.to_vec())?);
104-
Ok(())
105-
},
106-
)
107-
.map_err(
108-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
109-
file: column_path,
110-
error:format!("failed to read column from disk: {error}"),
111-
},
110+
&mut consume,
112111
)
112+
.map_err(|error| Error{
113+
file: column_path,
114+
error:format!("failed to read column from disk: {error}"),
115+
})
113116
}
114117
fnperform_read_serde(
115118
resource_suffix:&str,
@@ -119,25 +122,26 @@ impl SerializedSearchIndex {
119122
) -> Result<(),Error>{
120123
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
121124
let column_path = doc_root.join(format!("search.index/{column_name}/"));
125+
126+
letmut consume = |_,cell:&[u8]| {
127+
if cell.is_empty(){
128+
 column.push(None);
129+
}else{
130+
 column.push(Some(serde_json::from_slice(cell)?));
131+
}
132+
Ok::<_, serde_json::Error>(())
133+
};
134+
122135
 stringdex_internals::read_data_from_disk_column(
123136
 root_path,
124137
 column_name.as_bytes(),
125138
 column_path.clone(),
126-
&mut |_id, item| {
127-
if item.is_empty(){
128-
 column.push(None);
129-
}else{
130-
 column.push(Some(serde_json::from_slice(item)?));
131-
}
132-
Ok(())
133-
},
134-
)
135-
.map_err(
136-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
137-
file: column_path,
138-
error:format!("failed to read column from disk: {error}"),
139-
},
139+
&mut consume,
140140
)
141+
.map_err(|error| Error{
142+
file: column_path,
143+
error:format!("failed to read column from disk: {error}"),
144+
})
141145
}
142146
fnperform_read_postings(
143147
resource_suffix:&str,
@@ -147,23 +151,28 @@ impl SerializedSearchIndex {
147151
) -> Result<(),Error>{
148152
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
149153
let column_path = doc_root.join(format!("search.index/{column_name}/"));
154+
155+
fnconsumer(
156+
column:&mutVec<Vec<Vec<u32>>>,
157+
) -> implFnMut(u32,&[u8]) -> io::Result<()>{
158+
 |_, cell| {
159+
letmut postings = Vec::new();
160+
 encode::read_postings_from_string(&mut postings, cell);
161+
 column.push(postings);
162+
Ok(())
163+
}
164+
}
165+
150166
 stringdex_internals::read_data_from_disk_column(
151167
 root_path,
152168
 column_name.as_bytes(),
153169
 column_path.clone(),
154-
&mut |_id, buf| {
155-
letmut postings = Vec::new();
156-
 encode::read_postings_from_string(&mut postings, buf);
157-
 column.push(postings);
158-
Ok(())
159-
},
160-
)
161-
.map_err(
162-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
163-
file: column_path,
164-
error:format!("failed to read column from disk: {error}"),
165-
},
170+
&mutconsumer(column),
166171
)
172+
.map_err(|error| Error{
173+
file: column_path,
174+
error:format!("failed to read column from disk: {error}"),
175+
})
167176
}
168177

169178
assert_eq!(names.len(), path_data.len());
@@ -1055,12 +1064,12 @@ impl Serialize for TypeData {
10551064
letmut buf = Vec::new();
10561065
 encode::write_postings_to_string(&self.inverted_function_inputs_index,&mut buf);
10571066
letmut serialized_result = Vec::new();
1058-
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result);
1067+
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result).unwrap();
10591068
 seq.serialize_element(&str::from_utf8(&serialized_result).unwrap())?;
10601069
 buf.clear();
10611070
 serialized_result.clear();
10621071
 encode::write_postings_to_string(&self.inverted_function_output_index,&mut buf);
1063-
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result);
1072+
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result).unwrap();
10641073
 seq.serialize_element(&str::from_utf8(&serialized_result).unwrap())?;
10651074
ifself.search_unbox{
10661075
 seq.serialize_element(&1)?;
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit d682af8
Browse files
borsbors
committed
Auto merge of #147918 - yotamofek:pr/stringdex-fork, r=GuillaumeGomez
Upgrade `stringdex` to 0.0.3
Includes a bunch of optimizations for a nice perf win
2 parents 5dbf406 + e921e28 commit d682af8
3 files changed
Lines changed: 53 additions & 44 deletions
File tree
‎Cargo.lock‎
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
12891289
checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
12901290
dependencies = [
12911291
"libc",
1292-
"windows-sys 0.52.0",
1292+
"windows-sys 0.60.2",
12931293
]
12941294

12951295
[[package]]
@@ -2155,7 +2155,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
21552155
checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
21562156
dependencies = [
21572157
"cfg-if",
2158-
"windows-targets 0.52.6",
2158+
"windows-targets 0.53.3",
21592159
]
21602160

21612161
[[package]]
@@ -4907,7 +4907,7 @@ dependencies = [
49074907
"errno",
49084908
"libc",
49094909
"linux-raw-sys",
4910-
"windows-sys 0.52.0",
4910+
"windows-sys 0.61.2",
49114911
]
49124912

49134913
[[package]]
@@ -5275,9 +5275,9 @@ dependencies = [
52755275

52765276
[[package]]
52775277
name = "stringdex"
5278-
version = "0.0.2"
5278+
version = "0.0.3"
52795279
source = "registry+https://github.com/rust-lang/crates.io-index"
5280-
checksum = "18b3bd4f10d15ef859c40291769f0d85209de6b0f1c30713ff9cdf45ac43ea36"
5280+
checksum = "556a6126952cb2f5150057c98a77cc6c771027dea2825bf7fa03d3d638b0a4f8"
52815281
dependencies = [
52825282
"stacker",
52835283
]
‎src/librustdoc/Cargo.toml‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ rustdoc-json-types = { path = "../rustdoc-json-types" }
2121
serde = { version = "1.0", features = ["derive"] }
2222
serde_json = "1.0"
2323
smallvec = "1.8.1"
24-
stringdex = "=0.0.2"
24+
stringdex = "=0.0.3"
2525
tempfile = "3"
2626
threadpool = "1.8.1"
2727
tikv-jemalloc-sys = { version = "0.6.1", optional = true, features = ['override_allocator_on_supported_platforms'] }
‎src/librustdoc/html/render/search_index.rs‎
Lines changed: 47 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ mod serde;
33

44
use std::collections::BTreeSet;
55
use std::collections::hash_map::Entry;
6+
use std::io;
67
use std::path::Path;
8+
use std::string::FromUtf8Error;
79

810
use::serde::de::{self,Deserializer,Erroras _};
911
use::serde::ser::{SerializeSeq,Serializer};
@@ -95,21 +97,22 @@ impl SerializedSearchIndex {
9597
) -> Result<(),Error>{
9698
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
9799
let column_path = doc_root.join(format!("search.index/{column_name}/"));
100+
101+
letmut consume = |_,cell:&[u8]| {
102+
 column.push(String::from_utf8(cell.to_vec())?);
103+
Ok::<_,FromUtf8Error>(())
104+
};
105+
98106
 stringdex_internals::read_data_from_disk_column(
99107
 root_path,
100108
 column_name.as_bytes(),
101109
 column_path.clone(),
102-
&mut |_id, item| {
103-
 column.push(String::from_utf8(item.to_vec())?);
104-
Ok(())
105-
},
106-
)
107-
.map_err(
108-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
109-
file: column_path,
110-
error:format!("failed to read column from disk: {error}"),
111-
},
110+
&mut consume,
112111
)
112+
.map_err(|error| Error{
113+
file: column_path,
114+
error:format!("failed to read column from disk: {error}"),
115+
})
113116
}
114117
fnperform_read_serde(
115118
resource_suffix:&str,
@@ -119,25 +122,26 @@ impl SerializedSearchIndex {
119122
) -> Result<(),Error>{
120123
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
121124
let column_path = doc_root.join(format!("search.index/{column_name}/"));
125+
126+
letmut consume = |_,cell:&[u8]| {
127+
if cell.is_empty(){
128+
 column.push(None);
129+
}else{
130+
 column.push(Some(serde_json::from_slice(cell)?));
131+
}
132+
Ok::<_, serde_json::Error>(())
133+
};
134+
122135
 stringdex_internals::read_data_from_disk_column(
123136
 root_path,
124137
 column_name.as_bytes(),
125138
 column_path.clone(),
126-
&mut |_id, item| {
127-
if item.is_empty(){
128-
 column.push(None);
129-
}else{
130-
 column.push(Some(serde_json::from_slice(item)?));
131-
}
132-
Ok(())
133-
},
134-
)
135-
.map_err(
136-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
137-
file: column_path,
138-
error:format!("failed to read column from disk: {error}"),
139-
},
139+
&mut consume,
140140
)
141+
.map_err(|error| Error{
142+
file: column_path,
143+
error:format!("failed to read column from disk: {error}"),
144+
})
141145
}
142146
fnperform_read_postings(
143147
resource_suffix:&str,
@@ -147,23 +151,28 @@ impl SerializedSearchIndex {
147151
) -> Result<(),Error>{
148152
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
149153
let column_path = doc_root.join(format!("search.index/{column_name}/"));
154+
155+
fnconsumer(
156+
column:&mutVec<Vec<Vec<u32>>>,
157+
) -> implFnMut(u32,&[u8]) -> io::Result<()>{
158+
 |_, cell| {
159+
letmut postings = Vec::new();
160+
 encode::read_postings_from_string(&mut postings, cell);
161+
 column.push(postings);
162+
Ok(())
163+
}
164+
}
165+
150166
 stringdex_internals::read_data_from_disk_column(
151167
 root_path,
152168
 column_name.as_bytes(),
153169
 column_path.clone(),
154-
&mut |_id, buf| {
155-
letmut postings = Vec::new();
156-
 encode::read_postings_from_string(&mut postings, buf);
157-
 column.push(postings);
158-
Ok(())
159-
},
160-
)
161-
.map_err(
162-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
163-
file: column_path,
164-
error:format!("failed to read column from disk: {error}"),
165-
},
170+
&mutconsumer(column),
166171
)
172+
.map_err(|error| Error{
173+
file: column_path,
174+
error:format!("failed to read column from disk: {error}"),
175+
})
167176
}
168177

169178
assert_eq!(names.len(), path_data.len());
@@ -1055,12 +1064,12 @@ impl Serialize for TypeData {
10551064
letmut buf = Vec::new();
10561065
 encode::write_postings_to_string(&self.inverted_function_inputs_index,&mut buf);
10571066
letmut serialized_result = Vec::new();
1058-
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result);
1067+
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result).unwrap();
10591068
 seq.serialize_element(&str::from_utf8(&serialized_result).unwrap())?;
10601069
 buf.clear();
10611070
 serialized_result.clear();
10621071
 encode::write_postings_to_string(&self.inverted_function_output_index,&mut buf);
1063-
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result);
1072+
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result).unwrap();
10641073
 seq.serialize_element(&str::from_utf8(&serialized_result).unwrap())?;
10651074
ifself.search_unbox{
10661075
 seq.serialize_element(&1)?;
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit d682af8
Browse files
borsbors
committed
Auto merge of #147918 - yotamofek:pr/stringdex-fork, r=GuillaumeGomez
Upgrade `stringdex` to 0.0.3
Includes a bunch of optimizations for a nice perf win
2 parents 5dbf406 + e921e28 commit d682af8
3 files changed
Lines changed: 53 additions & 44 deletions
File tree
‎Cargo.lock‎
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
12891289
checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
12901290
dependencies = [
12911291
"libc",
1292-
"windows-sys 0.52.0",
1292+
"windows-sys 0.60.2",
12931293
]
12941294

12951295
[[package]]
@@ -2155,7 +2155,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
21552155
checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
21562156
dependencies = [
21572157
"cfg-if",
2158-
"windows-targets 0.52.6",
2158+
"windows-targets 0.53.3",
21592159
]
21602160

21612161
[[package]]
@@ -4907,7 +4907,7 @@ dependencies = [
49074907
"errno",
49084908
"libc",
49094909
"linux-raw-sys",
4910-
"windows-sys 0.52.0",
4910+
"windows-sys 0.61.2",
49114911
]
49124912

49134913
[[package]]
@@ -5275,9 +5275,9 @@ dependencies = [
52755275

52765276
[[package]]
52775277
name = "stringdex"
5278-
version = "0.0.2"
5278+
version = "0.0.3"
52795279
source = "registry+https://github.com/rust-lang/crates.io-index"
5280-
checksum = "18b3bd4f10d15ef859c40291769f0d85209de6b0f1c30713ff9cdf45ac43ea36"
5280+
checksum = "556a6126952cb2f5150057c98a77cc6c771027dea2825bf7fa03d3d638b0a4f8"
52815281
dependencies = [
52825282
"stacker",
52835283
]
‎src/librustdoc/Cargo.toml‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ rustdoc-json-types = { path = "../rustdoc-json-types" }
2121
serde = { version = "1.0", features = ["derive"] }
2222
serde_json = "1.0"
2323
smallvec = "1.8.1"
24-
stringdex = "=0.0.2"
24+
stringdex = "=0.0.3"
2525
tempfile = "3"
2626
threadpool = "1.8.1"
2727
tikv-jemalloc-sys = { version = "0.6.1", optional = true, features = ['override_allocator_on_supported_platforms'] }
‎src/librustdoc/html/render/search_index.rs‎
Lines changed: 47 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ mod serde;
33

44
use std::collections::BTreeSet;
55
use std::collections::hash_map::Entry;
6+
use std::io;
67
use std::path::Path;
8+
use std::string::FromUtf8Error;
79

810
use::serde::de::{self,Deserializer,Erroras _};
911
use::serde::ser::{SerializeSeq,Serializer};
@@ -95,21 +97,22 @@ impl SerializedSearchIndex {
9597
) -> Result<(),Error>{
9698
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
9799
let column_path = doc_root.join(format!("search.index/{column_name}/"));
100+
101+
letmut consume = |_,cell:&[u8]| {
102+
 column.push(String::from_utf8(cell.to_vec())?);
103+
Ok::<_,FromUtf8Error>(())
104+
};
105+
98106
 stringdex_internals::read_data_from_disk_column(
99107
 root_path,
100108
 column_name.as_bytes(),
101109
 column_path.clone(),
102-
&mut |_id, item| {
103-
 column.push(String::from_utf8(item.to_vec())?);
104-
Ok(())
105-
},
106-
)
107-
.map_err(
108-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
109-
file: column_path,
110-
error:format!("failed to read column from disk: {error}"),
111-
},
110+
&mut consume,
112111
)
112+
.map_err(|error| Error{
113+
file: column_path,
114+
error:format!("failed to read column from disk: {error}"),
115+
})
113116
}
114117
fnperform_read_serde(
115118
resource_suffix:&str,
@@ -119,25 +122,26 @@ impl SerializedSearchIndex {
119122
) -> Result<(),Error>{
120123
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
121124
let column_path = doc_root.join(format!("search.index/{column_name}/"));
125+
126+
letmut consume = |_,cell:&[u8]| {
127+
if cell.is_empty(){
128+
 column.push(None);
129+
}else{
130+
 column.push(Some(serde_json::from_slice(cell)?));
131+
}
132+
Ok::<_, serde_json::Error>(())
133+
};
134+
122135
 stringdex_internals::read_data_from_disk_column(
123136
 root_path,
124137
 column_name.as_bytes(),
125138
 column_path.clone(),
126-
&mut |_id, item| {
127-
if item.is_empty(){
128-
 column.push(None);
129-
}else{
130-
 column.push(Some(serde_json::from_slice(item)?));
131-
}
132-
Ok(())
133-
},
134-
)
135-
.map_err(
136-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
137-
file: column_path,
138-
error:format!("failed to read column from disk: {error}"),
139-
},
139+
&mut consume,
140140
)
141+
.map_err(|error| Error{
142+
file: column_path,
143+
error:format!("failed to read column from disk: {error}"),
144+
})
141145
}
142146
fnperform_read_postings(
143147
resource_suffix:&str,
@@ -147,23 +151,28 @@ impl SerializedSearchIndex {
147151
) -> Result<(),Error>{
148152
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
149153
let column_path = doc_root.join(format!("search.index/{column_name}/"));
154+
155+
fnconsumer(
156+
column:&mutVec<Vec<Vec<u32>>>,
157+
) -> implFnMut(u32,&[u8]) -> io::Result<()>{
158+
 |_, cell| {
159+
letmut postings = Vec::new();
160+
 encode::read_postings_from_string(&mut postings, cell);
161+
 column.push(postings);
162+
Ok(())
163+
}
164+
}
165+
150166
 stringdex_internals::read_data_from_disk_column(
151167
 root_path,
152168
 column_name.as_bytes(),
153169
 column_path.clone(),
154-
&mut |_id, buf| {
155-
letmut postings = Vec::new();
156-
 encode::read_postings_from_string(&mut postings, buf);
157-
 column.push(postings);
158-
Ok(())
159-
},
160-
)
161-
.map_err(
162-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
163-
file: column_path,
164-
error:format!("failed to read column from disk: {error}"),
165-
},
170+
&mutconsumer(column),
166171
)
172+
.map_err(|error| Error{
173+
file: column_path,
174+
error:format!("failed to read column from disk: {error}"),
175+
})
167176
}
168177

169178
assert_eq!(names.len(), path_data.len());
@@ -1055,12 +1064,12 @@ impl Serialize for TypeData {
10551064
letmut buf = Vec::new();
10561065
 encode::write_postings_to_string(&self.inverted_function_inputs_index,&mut buf);
10571066
letmut serialized_result = Vec::new();
1058-
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result);
1067+
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result).unwrap();
10591068
 seq.serialize_element(&str::from_utf8(&serialized_result).unwrap())?;
10601069
 buf.clear();
10611070
 serialized_result.clear();
10621071
 encode::write_postings_to_string(&self.inverted_function_output_index,&mut buf);
1063-
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result);
1072+
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result).unwrap();
10641073
 seq.serialize_element(&str::from_utf8(&serialized_result).unwrap())?;
10651074
ifself.search_unbox{
10661075
 seq.serialize_element(&1)?;
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit d682af8
Browse files
borsbors
committed
Auto merge of #147918 - yotamofek:pr/stringdex-fork, r=GuillaumeGomez
Upgrade `stringdex` to 0.0.3
Includes a bunch of optimizations for a nice perf win
2 parents 5dbf406 + e921e28 commit d682af8
3 files changed
Lines changed: 53 additions & 44 deletions
File tree
‎Cargo.lock‎
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
12891289
checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
12901290
dependencies = [
12911291
"libc",
1292-
"windows-sys 0.52.0",
1292+
"windows-sys 0.60.2",
12931293
]
12941294

12951295
[[package]]
@@ -2155,7 +2155,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
21552155
checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
21562156
dependencies = [
21572157
"cfg-if",
2158-
"windows-targets 0.52.6",
2158+
"windows-targets 0.53.3",
21592159
]
21602160

21612161
[[package]]
@@ -4907,7 +4907,7 @@ dependencies = [
49074907
"errno",
49084908
"libc",
49094909
"linux-raw-sys",
4910-
"windows-sys 0.52.0",
4910+
"windows-sys 0.61.2",
49114911
]
49124912

49134913
[[package]]
@@ -5275,9 +5275,9 @@ dependencies = [
52755275

52765276
[[package]]
52775277
name = "stringdex"
5278-
version = "0.0.2"
5278+
version = "0.0.3"
52795279
source = "registry+https://github.com/rust-lang/crates.io-index"
5280-
checksum = "18b3bd4f10d15ef859c40291769f0d85209de6b0f1c30713ff9cdf45ac43ea36"
5280+
checksum = "556a6126952cb2f5150057c98a77cc6c771027dea2825bf7fa03d3d638b0a4f8"
52815281
dependencies = [
52825282
"stacker",
52835283
]
‎src/librustdoc/Cargo.toml‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ rustdoc-json-types = { path = "../rustdoc-json-types" }
2121
serde = { version = "1.0", features = ["derive"] }
2222
serde_json = "1.0"
2323
smallvec = "1.8.1"
24-
stringdex = "=0.0.2"
24+
stringdex = "=0.0.3"
2525
tempfile = "3"
2626
threadpool = "1.8.1"
2727
tikv-jemalloc-sys = { version = "0.6.1", optional = true, features = ['override_allocator_on_supported_platforms'] }
‎src/librustdoc/html/render/search_index.rs‎
Lines changed: 47 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ mod serde;
33

44
use std::collections::BTreeSet;
55
use std::collections::hash_map::Entry;
6+
use std::io;
67
use std::path::Path;
8+
use std::string::FromUtf8Error;
79

810
use::serde::de::{self,Deserializer,Erroras _};
911
use::serde::ser::{SerializeSeq,Serializer};
@@ -95,21 +97,22 @@ impl SerializedSearchIndex {
9597
) -> Result<(),Error>{
9698
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
9799
let column_path = doc_root.join(format!("search.index/{column_name}/"));
100+
101+
letmut consume = |_,cell:&[u8]| {
102+
 column.push(String::from_utf8(cell.to_vec())?);
103+
Ok::<_,FromUtf8Error>(())
104+
};
105+
98106
 stringdex_internals::read_data_from_disk_column(
99107
 root_path,
100108
 column_name.as_bytes(),
101109
 column_path.clone(),
102-
&mut |_id, item| {
103-
 column.push(String::from_utf8(item.to_vec())?);
104-
Ok(())
105-
},
106-
)
107-
.map_err(
108-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
109-
file: column_path,
110-
error:format!("failed to read column from disk: {error}"),
111-
},
110+
&mut consume,
112111
)
112+
.map_err(|error| Error{
113+
file: column_path,
114+
error:format!("failed to read column from disk: {error}"),
115+
})
113116
}
114117
fnperform_read_serde(
115118
resource_suffix:&str,
@@ -119,25 +122,26 @@ impl SerializedSearchIndex {
119122
) -> Result<(),Error>{
120123
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
121124
let column_path = doc_root.join(format!("search.index/{column_name}/"));
125+
126+
letmut consume = |_,cell:&[u8]| {
127+
if cell.is_empty(){
128+
 column.push(None);
129+
}else{
130+
 column.push(Some(serde_json::from_slice(cell)?));
131+
}
132+
Ok::<_, serde_json::Error>(())
133+
};
134+
122135
 stringdex_internals::read_data_from_disk_column(
123136
 root_path,
124137
 column_name.as_bytes(),
125138
 column_path.clone(),
126-
&mut |_id, item| {
127-
if item.is_empty(){
128-
 column.push(None);
129-
}else{
130-
 column.push(Some(serde_json::from_slice(item)?));
131-
}
132-
Ok(())
133-
},
134-
)
135-
.map_err(
136-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
137-
file: column_path,
138-
error:format!("failed to read column from disk: {error}"),
139-
},
139+
&mut consume,
140140
)
141+
.map_err(|error| Error{
142+
file: column_path,
143+
error:format!("failed to read column from disk: {error}"),
144+
})
141145
}
142146
fnperform_read_postings(
143147
resource_suffix:&str,
@@ -147,23 +151,28 @@ impl SerializedSearchIndex {
147151
) -> Result<(),Error>{
148152
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
149153
let column_path = doc_root.join(format!("search.index/{column_name}/"));
154+
155+
fnconsumer(
156+
column:&mutVec<Vec<Vec<u32>>>,
157+
) -> implFnMut(u32,&[u8]) -> io::Result<()>{
158+
 |_, cell| {
159+
letmut postings = Vec::new();
160+
 encode::read_postings_from_string(&mut postings, cell);
161+
 column.push(postings);
162+
Ok(())
163+
}
164+
}
165+
150166
 stringdex_internals::read_data_from_disk_column(
151167
 root_path,
152168
 column_name.as_bytes(),
153169
 column_path.clone(),
154-
&mut |_id, buf| {
155-
letmut postings = Vec::new();
156-
 encode::read_postings_from_string(&mut postings, buf);
157-
 column.push(postings);
158-
Ok(())
159-
},
160-
)
161-
.map_err(
162-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
163-
file: column_path,
164-
error:format!("failed to read column from disk: {error}"),
165-
},
170+
&mutconsumer(column),
166171
)
172+
.map_err(|error| Error{
173+
file: column_path,
174+
error:format!("failed to read column from disk: {error}"),
175+
})
167176
}
168177

169178
assert_eq!(names.len(), path_data.len());
@@ -1055,12 +1064,12 @@ impl Serialize for TypeData {
10551064
letmut buf = Vec::new();
10561065
 encode::write_postings_to_string(&self.inverted_function_inputs_index,&mut buf);
10571066
letmut serialized_result = Vec::new();
1058-
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result);
1067+
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result).unwrap();
10591068
 seq.serialize_element(&str::from_utf8(&serialized_result).unwrap())?;
10601069
 buf.clear();
10611070
 serialized_result.clear();
10621071
 encode::write_postings_to_string(&self.inverted_function_output_index,&mut buf);
1063-
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result);
1072+
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result).unwrap();
10641073
 seq.serialize_element(&str::from_utf8(&serialized_result).unwrap())?;
10651074
ifself.search_unbox{
10661075
 seq.serialize_element(&1)?;
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit d682af8
Browse files
borsbors
committed
Auto merge of #147918 - yotamofek:pr/stringdex-fork, r=GuillaumeGomez
Upgrade `stringdex` to 0.0.3
Includes a bunch of optimizations for a nice perf win
2 parents 5dbf406 + e921e28 commit d682af8
3 files changed
Lines changed: 53 additions & 44 deletions
File tree
‎Cargo.lock‎
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
12891289
checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
12901290
dependencies = [
12911291
"libc",
1292-
"windows-sys 0.52.0",
1292+
"windows-sys 0.60.2",
12931293
]
12941294

12951295
[[package]]
@@ -2155,7 +2155,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
21552155
checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
21562156
dependencies = [
21572157
"cfg-if",
2158-
"windows-targets 0.52.6",
2158+
"windows-targets 0.53.3",
21592159
]
21602160

21612161
[[package]]
@@ -4907,7 +4907,7 @@ dependencies = [
49074907
"errno",
49084908
"libc",
49094909
"linux-raw-sys",
4910-
"windows-sys 0.52.0",
4910+
"windows-sys 0.61.2",
49114911
]
49124912

49134913
[[package]]
@@ -5275,9 +5275,9 @@ dependencies = [
52755275

52765276
[[package]]
52775277
name = "stringdex"
5278-
version = "0.0.2"
5278+
version = "0.0.3"
52795279
source = "registry+https://github.com/rust-lang/crates.io-index"
5280-
checksum = "18b3bd4f10d15ef859c40291769f0d85209de6b0f1c30713ff9cdf45ac43ea36"
5280+
checksum = "556a6126952cb2f5150057c98a77cc6c771027dea2825bf7fa03d3d638b0a4f8"
52815281
dependencies = [
52825282
"stacker",
52835283
]
‎src/librustdoc/Cargo.toml‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ rustdoc-json-types = { path = "../rustdoc-json-types" }
2121
serde = { version = "1.0", features = ["derive"] }
2222
serde_json = "1.0"
2323
smallvec = "1.8.1"
24-
stringdex = "=0.0.2"
24+
stringdex = "=0.0.3"
2525
tempfile = "3"
2626
threadpool = "1.8.1"
2727
tikv-jemalloc-sys = { version = "0.6.1", optional = true, features = ['override_allocator_on_supported_platforms'] }
‎src/librustdoc/html/render/search_index.rs‎
Lines changed: 47 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ mod serde;
33

44
use std::collections::BTreeSet;
55
use std::collections::hash_map::Entry;
6+
use std::io;
67
use std::path::Path;
8+
use std::string::FromUtf8Error;
79

810
use::serde::de::{self,Deserializer,Erroras _};
911
use::serde::ser::{SerializeSeq,Serializer};
@@ -95,21 +97,22 @@ impl SerializedSearchIndex {
9597
) -> Result<(),Error>{
9698
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
9799
let column_path = doc_root.join(format!("search.index/{column_name}/"));
100+
101+
letmut consume = |_,cell:&[u8]| {
102+
 column.push(String::from_utf8(cell.to_vec())?);
103+
Ok::<_,FromUtf8Error>(())
104+
};
105+
98106
 stringdex_internals::read_data_from_disk_column(
99107
 root_path,
100108
 column_name.as_bytes(),
101109
 column_path.clone(),
102-
&mut |_id, item| {
103-
 column.push(String::from_utf8(item.to_vec())?);
104-
Ok(())
105-
},
106-
)
107-
.map_err(
108-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
109-
file: column_path,
110-
error:format!("failed to read column from disk: {error}"),
111-
},
110+
&mut consume,
112111
)
112+
.map_err(|error| Error{
113+
file: column_path,
114+
error:format!("failed to read column from disk: {error}"),
115+
})
113116
}
114117
fnperform_read_serde(
115118
resource_suffix:&str,
@@ -119,25 +122,26 @@ impl SerializedSearchIndex {
119122
) -> Result<(),Error>{
120123
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
121124
let column_path = doc_root.join(format!("search.index/{column_name}/"));
125+
126+
letmut consume = |_,cell:&[u8]| {
127+
if cell.is_empty(){
128+
 column.push(None);
129+
}else{
130+
 column.push(Some(serde_json::from_slice(cell)?));
131+
}
132+
Ok::<_, serde_json::Error>(())
133+
};
134+
122135
 stringdex_internals::read_data_from_disk_column(
123136
 root_path,
124137
 column_name.as_bytes(),
125138
 column_path.clone(),
126-
&mut |_id, item| {
127-
if item.is_empty(){
128-
 column.push(None);
129-
}else{
130-
 column.push(Some(serde_json::from_slice(item)?));
131-
}
132-
Ok(())
133-
},
134-
)
135-
.map_err(
136-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
137-
file: column_path,
138-
error:format!("failed to read column from disk: {error}"),
139-
},
139+
&mut consume,
140140
)
141+
.map_err(|error| Error{
142+
file: column_path,
143+
error:format!("failed to read column from disk: {error}"),
144+
})
141145
}
142146
fnperform_read_postings(
143147
resource_suffix:&str,
@@ -147,23 +151,28 @@ impl SerializedSearchIndex {
147151
) -> Result<(),Error>{
148152
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
149153
let column_path = doc_root.join(format!("search.index/{column_name}/"));
154+
155+
fnconsumer(
156+
column:&mutVec<Vec<Vec<u32>>>,
157+
) -> implFnMut(u32,&[u8]) -> io::Result<()>{
158+
 |_, cell| {
159+
letmut postings = Vec::new();
160+
 encode::read_postings_from_string(&mut postings, cell);
161+
 column.push(postings);
162+
Ok(())
163+
}
164+
}
165+
150166
 stringdex_internals::read_data_from_disk_column(
151167
 root_path,
152168
 column_name.as_bytes(),
153169
 column_path.clone(),
154-
&mut |_id, buf| {
155-
letmut postings = Vec::new();
156-
 encode::read_postings_from_string(&mut postings, buf);
157-
 column.push(postings);
158-
Ok(())
159-
},
160-
)
161-
.map_err(
162-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
163-
file: column_path,
164-
error:format!("failed to read column from disk: {error}"),
165-
},
170+
&mutconsumer(column),
166171
)
172+
.map_err(|error| Error{
173+
file: column_path,
174+
error:format!("failed to read column from disk: {error}"),
175+
})
167176
}
168177

169178
assert_eq!(names.len(), path_data.len());
@@ -1055,12 +1064,12 @@ impl Serialize for TypeData {
10551064
letmut buf = Vec::new();
10561065
 encode::write_postings_to_string(&self.inverted_function_inputs_index,&mut buf);
10571066
letmut serialized_result = Vec::new();
1058-
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result);
1067+
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result).unwrap();
10591068
 seq.serialize_element(&str::from_utf8(&serialized_result).unwrap())?;
10601069
 buf.clear();
10611070
 serialized_result.clear();
10621071
 encode::write_postings_to_string(&self.inverted_function_output_index,&mut buf);
1063-
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result);
1072+
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result).unwrap();
10641073
 seq.serialize_element(&str::from_utf8(&serialized_result).unwrap())?;
10651074
ifself.search_unbox{
10661075
 seq.serialize_element(&1)?;
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit d682af8
Browse files
borsbors
committed
Auto merge of #147918 - yotamofek:pr/stringdex-fork, r=GuillaumeGomez
Upgrade `stringdex` to 0.0.3
Includes a bunch of optimizations for a nice perf win
2 parents 5dbf406 + e921e28 commit d682af8
3 files changed
Lines changed: 53 additions & 44 deletions
File tree
‎Cargo.lock‎
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
12891289
checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
12901290
dependencies = [
12911291
"libc",
1292-
"windows-sys 0.52.0",
1292+
"windows-sys 0.60.2",
12931293
]
12941294

12951295
[[package]]
@@ -2155,7 +2155,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
21552155
checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
21562156
dependencies = [
21572157
"cfg-if",
2158-
"windows-targets 0.52.6",
2158+
"windows-targets 0.53.3",
21592159
]
21602160

21612161
[[package]]
@@ -4907,7 +4907,7 @@ dependencies = [
49074907
"errno",
49084908
"libc",
49094909
"linux-raw-sys",
4910-
"windows-sys 0.52.0",
4910+
"windows-sys 0.61.2",
49114911
]
49124912

49134913
[[package]]
@@ -5275,9 +5275,9 @@ dependencies = [
52755275

52765276
[[package]]
52775277
name = "stringdex"
5278-
version = "0.0.2"
5278+
version = "0.0.3"
52795279
source = "registry+https://github.com/rust-lang/crates.io-index"
5280-
checksum = "18b3bd4f10d15ef859c40291769f0d85209de6b0f1c30713ff9cdf45ac43ea36"
5280+
checksum = "556a6126952cb2f5150057c98a77cc6c771027dea2825bf7fa03d3d638b0a4f8"
52815281
dependencies = [
52825282
"stacker",
52835283
]
‎src/librustdoc/Cargo.toml‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ rustdoc-json-types = { path = "../rustdoc-json-types" }
2121
serde = { version = "1.0", features = ["derive"] }
2222
serde_json = "1.0"
2323
smallvec = "1.8.1"
24-
stringdex = "=0.0.2"
24+
stringdex = "=0.0.3"
2525
tempfile = "3"
2626
threadpool = "1.8.1"
2727
tikv-jemalloc-sys = { version = "0.6.1", optional = true, features = ['override_allocator_on_supported_platforms'] }
‎src/librustdoc/html/render/search_index.rs‎
Lines changed: 47 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ mod serde;
33

44
use std::collections::BTreeSet;
55
use std::collections::hash_map::Entry;
6+
use std::io;
67
use std::path::Path;
8+
use std::string::FromUtf8Error;
79

810
use::serde::de::{self,Deserializer,Erroras _};
911
use::serde::ser::{SerializeSeq,Serializer};
@@ -95,21 +97,22 @@ impl SerializedSearchIndex {
9597
) -> Result<(),Error>{
9698
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
9799
let column_path = doc_root.join(format!("search.index/{column_name}/"));
100+
101+
letmut consume = |_,cell:&[u8]| {
102+
 column.push(String::from_utf8(cell.to_vec())?);
103+
Ok::<_,FromUtf8Error>(())
104+
};
105+
98106
 stringdex_internals::read_data_from_disk_column(
99107
 root_path,
100108
 column_name.as_bytes(),
101109
 column_path.clone(),
102-
&mut |_id, item| {
103-
 column.push(String::from_utf8(item.to_vec())?);
104-
Ok(())
105-
},
106-
)
107-
.map_err(
108-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
109-
file: column_path,
110-
error:format!("failed to read column from disk: {error}"),
111-
},
110+
&mut consume,
112111
)
112+
.map_err(|error| Error{
113+
file: column_path,
114+
error:format!("failed to read column from disk: {error}"),
115+
})
113116
}
114117
fnperform_read_serde(
115118
resource_suffix:&str,
@@ -119,25 +122,26 @@ impl SerializedSearchIndex {
119122
) -> Result<(),Error>{
120123
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
121124
let column_path = doc_root.join(format!("search.index/{column_name}/"));
125+
126+
letmut consume = |_,cell:&[u8]| {
127+
if cell.is_empty(){
128+
 column.push(None);
129+
}else{
130+
 column.push(Some(serde_json::from_slice(cell)?));
131+
}
132+
Ok::<_, serde_json::Error>(())
133+
};
134+
122135
 stringdex_internals::read_data_from_disk_column(
123136
 root_path,
124137
 column_name.as_bytes(),
125138
 column_path.clone(),
126-
&mut |_id, item| {
127-
if item.is_empty(){
128-
 column.push(None);
129-
}else{
130-
 column.push(Some(serde_json::from_slice(item)?));
131-
}
132-
Ok(())
133-
},
134-
)
135-
.map_err(
136-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
137-
file: column_path,
138-
error:format!("failed to read column from disk: {error}"),
139-
},
139+
&mut consume,
140140
)
141+
.map_err(|error| Error{
142+
file: column_path,
143+
error:format!("failed to read column from disk: {error}"),
144+
})
141145
}
142146
fnperform_read_postings(
143147
resource_suffix:&str,
@@ -147,23 +151,28 @@ impl SerializedSearchIndex {
147151
) -> Result<(),Error>{
148152
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
149153
let column_path = doc_root.join(format!("search.index/{column_name}/"));
154+
155+
fnconsumer(
156+
column:&mutVec<Vec<Vec<u32>>>,
157+
) -> implFnMut(u32,&[u8]) -> io::Result<()>{
158+
 |_, cell| {
159+
letmut postings = Vec::new();
160+
 encode::read_postings_from_string(&mut postings, cell);
161+
 column.push(postings);
162+
Ok(())
163+
}
164+
}
165+
150166
 stringdex_internals::read_data_from_disk_column(
151167
 root_path,
152168
 column_name.as_bytes(),
153169
 column_path.clone(),
154-
&mut |_id, buf| {
155-
letmut postings = Vec::new();
156-
 encode::read_postings_from_string(&mut postings, buf);
157-
 column.push(postings);
158-
Ok(())
159-
},
160-
)
161-
.map_err(
162-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
163-
file: column_path,
164-
error:format!("failed to read column from disk: {error}"),
165-
},
170+
&mutconsumer(column),
166171
)
172+
.map_err(|error| Error{
173+
file: column_path,
174+
error:format!("failed to read column from disk: {error}"),
175+
})
167176
}
168177

169178
assert_eq!(names.len(), path_data.len());
@@ -1055,12 +1064,12 @@ impl Serialize for TypeData {
10551064
letmut buf = Vec::new();
10561065
 encode::write_postings_to_string(&self.inverted_function_inputs_index,&mut buf);
10571066
letmut serialized_result = Vec::new();
1058-
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result);
1067+
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result).unwrap();
10591068
 seq.serialize_element(&str::from_utf8(&serialized_result).unwrap())?;
10601069
 buf.clear();
10611070
 serialized_result.clear();
10621071
 encode::write_postings_to_string(&self.inverted_function_output_index,&mut buf);
1063-
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result);
1072+
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result).unwrap();
10641073
 seq.serialize_element(&str::from_utf8(&serialized_result).unwrap())?;
10651074
ifself.search_unbox{
10661075
 seq.serialize_element(&1)?;
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit d682af8
Browse files
borsbors
committed
Auto merge of #147918 - yotamofek:pr/stringdex-fork, r=GuillaumeGomez
Upgrade `stringdex` to 0.0.3
Includes a bunch of optimizations for a nice perf win
2 parents 5dbf406 + e921e28 commit d682af8
3 files changed
Lines changed: 53 additions & 44 deletions
File tree
‎Cargo.lock‎
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
12891289
checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
12901290
dependencies = [
12911291
"libc",
1292-
"windows-sys 0.52.0",
1292+
"windows-sys 0.60.2",
12931293
]
12941294

12951295
[[package]]
@@ -2155,7 +2155,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
21552155
checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
21562156
dependencies = [
21572157
"cfg-if",
2158-
"windows-targets 0.52.6",
2158+
"windows-targets 0.53.3",
21592159
]
21602160

21612161
[[package]]
@@ -4907,7 +4907,7 @@ dependencies = [
49074907
"errno",
49084908
"libc",
49094909
"linux-raw-sys",
4910-
"windows-sys 0.52.0",
4910+
"windows-sys 0.61.2",
49114911
]
49124912

49134913
[[package]]
@@ -5275,9 +5275,9 @@ dependencies = [
52755275

52765276
[[package]]
52775277
name = "stringdex"
5278-
version = "0.0.2"
5278+
version = "0.0.3"
52795279
source = "registry+https://github.com/rust-lang/crates.io-index"
5280-
checksum = "18b3bd4f10d15ef859c40291769f0d85209de6b0f1c30713ff9cdf45ac43ea36"
5280+
checksum = "556a6126952cb2f5150057c98a77cc6c771027dea2825bf7fa03d3d638b0a4f8"
52815281
dependencies = [
52825282
"stacker",
52835283
]
‎src/librustdoc/Cargo.toml‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ rustdoc-json-types = { path = "../rustdoc-json-types" }
2121
serde = { version = "1.0", features = ["derive"] }
2222
serde_json = "1.0"
2323
smallvec = "1.8.1"
24-
stringdex = "=0.0.2"
24+
stringdex = "=0.0.3"
2525
tempfile = "3"
2626
threadpool = "1.8.1"
2727
tikv-jemalloc-sys = { version = "0.6.1", optional = true, features = ['override_allocator_on_supported_platforms'] }
‎src/librustdoc/html/render/search_index.rs‎
Lines changed: 47 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ mod serde;
33

44
use std::collections::BTreeSet;
55
use std::collections::hash_map::Entry;
6+
use std::io;
67
use std::path::Path;
8+
use std::string::FromUtf8Error;
79

810
use::serde::de::{self,Deserializer,Erroras _};
911
use::serde::ser::{SerializeSeq,Serializer};
@@ -95,21 +97,22 @@ impl SerializedSearchIndex {
9597
) -> Result<(),Error>{
9698
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
9799
let column_path = doc_root.join(format!("search.index/{column_name}/"));
100+
101+
letmut consume = |_,cell:&[u8]| {
102+
 column.push(String::from_utf8(cell.to_vec())?);
103+
Ok::<_,FromUtf8Error>(())
104+
};
105+
98106
 stringdex_internals::read_data_from_disk_column(
99107
 root_path,
100108
 column_name.as_bytes(),
101109
 column_path.clone(),
102-
&mut |_id, item| {
103-
 column.push(String::from_utf8(item.to_vec())?);
104-
Ok(())
105-
},
106-
)
107-
.map_err(
108-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
109-
file: column_path,
110-
error:format!("failed to read column from disk: {error}"),
111-
},
110+
&mut consume,
112111
)
112+
.map_err(|error| Error{
113+
file: column_path,
114+
error:format!("failed to read column from disk: {error}"),
115+
})
113116
}
114117
fnperform_read_serde(
115118
resource_suffix:&str,
@@ -119,25 +122,26 @@ impl SerializedSearchIndex {
119122
) -> Result<(),Error>{
120123
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
121124
let column_path = doc_root.join(format!("search.index/{column_name}/"));
125+
126+
letmut consume = |_,cell:&[u8]| {
127+
if cell.is_empty(){
128+
 column.push(None);
129+
}else{
130+
 column.push(Some(serde_json::from_slice(cell)?));
131+
}
132+
Ok::<_, serde_json::Error>(())
133+
};
134+
122135
 stringdex_internals::read_data_from_disk_column(
123136
 root_path,
124137
 column_name.as_bytes(),
125138
 column_path.clone(),
126-
&mut |_id, item| {
127-
if item.is_empty(){
128-
 column.push(None);
129-
}else{
130-
 column.push(Some(serde_json::from_slice(item)?));
131-
}
132-
Ok(())
133-
},
134-
)
135-
.map_err(
136-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
137-
file: column_path,
138-
error:format!("failed to read column from disk: {error}"),
139-
},
139+
&mut consume,
140140
)
141+
.map_err(|error| Error{
142+
file: column_path,
143+
error:format!("failed to read column from disk: {error}"),
144+
})
141145
}
142146
fnperform_read_postings(
143147
resource_suffix:&str,
@@ -147,23 +151,28 @@ impl SerializedSearchIndex {
147151
) -> Result<(),Error>{
148152
let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
149153
let column_path = doc_root.join(format!("search.index/{column_name}/"));
154+
155+
fnconsumer(
156+
column:&mutVec<Vec<Vec<u32>>>,
157+
) -> implFnMut(u32,&[u8]) -> io::Result<()>{
158+
 |_, cell| {
159+
letmut postings = Vec::new();
160+
 encode::read_postings_from_string(&mut postings, cell);
161+
 column.push(postings);
162+
Ok(())
163+
}
164+
}
165+
150166
 stringdex_internals::read_data_from_disk_column(
151167
 root_path,
152168
 column_name.as_bytes(),
153169
 column_path.clone(),
154-
&mut |_id, buf| {
155-
letmut postings = Vec::new();
156-
 encode::read_postings_from_string(&mut postings, buf);
157-
 column.push(postings);
158-
Ok(())
159-
},
160-
)
161-
.map_err(
162-
 |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error{
163-
file: column_path,
164-
error:format!("failed to read column from disk: {error}"),
165-
},
170+
&mutconsumer(column),
166171
)
172+
.map_err(|error| Error{
173+
file: column_path,
174+
error:format!("failed to read column from disk: {error}"),
175+
})
167176
}
168177

169178
assert_eq!(names.len(), path_data.len());
@@ -1055,12 +1064,12 @@ impl Serialize for TypeData {
10551064
letmut buf = Vec::new();
10561065
 encode::write_postings_to_string(&self.inverted_function_inputs_index,&mut buf);
10571066
letmut serialized_result = Vec::new();
1058-
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result);
1067+
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result).unwrap();
10591068
 seq.serialize_element(&str::from_utf8(&serialized_result).unwrap())?;
10601069
 buf.clear();
10611070
 serialized_result.clear();
10621071
 encode::write_postings_to_string(&self.inverted_function_output_index,&mut buf);
1063-
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result);
1072+
 stringdex_internals::encode::write_base64_to_bytes(&buf,&mut serialized_result).unwrap();
10641073
 seq.serialize_element(&str::from_utf8(&serialized_result).unwrap())?;
10651074
ifself.search_unbox{
10661075
 seq.serialize_element(&1)?;
0 commit comments
Comments
 (0)