Skip to content

Commit 49bbe03

Browse files
committed
Properly HTML escape docs for Type
1 parent c185bcf commit 49bbe03

File tree

6 files changed

+99
-90
lines changed

6 files changed

+99
-90
lines changed

codegen/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ authors = ["Steven Fackler <[email protected]>"]
66
[dependencies]
77
phf_codegen = "0.7"
88
regex = "0.1"
9+
marksman_escape = "0.1"

codegen/src/main.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
extern crate phf_codegen;
22
extern crate regex;
3+
extern crate marksman_escape;
34

45
use std::ascii::AsciiExt;
56
use std::path::Path;

codegen/src/sqlstate.rs

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ fn make_header(file: &mut BufWriter<File>) {
7474
write!(file,
7575
"// Autogenerated file - DO NOT EDIT
7676
use phf;
77+
7778
"
7879
).unwrap();
7980
}

codegen/src/types.rs

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use std::collections::BTreeMap;
44
use std::fs::File;
55
use std::io::{Write, BufWriter};
66
use std::path::Path;
7+
use marksman_escape::Escape;
78

89
use snake_to_camel;
910

@@ -99,6 +100,8 @@ fn parse_types(ranges: &BTreeMap<u32, u32>) -> BTreeMap<u32, Type> {
99100
doc.push_str(" - ");
100101
doc.push_str(descr);
101102
}
103+
let doc = Escape::new(doc.as_bytes().iter().cloned()).collect();
104+
let doc = String::from_utf8(doc).unwrap();
102105

103106
let type_ = Type {
104107
name: name,
@@ -120,6 +123,7 @@ fn make_header(w: &mut BufWriter<File>) {
120123
use std::fmt;
121124
122125
use types::{{Oid, Kind, Other}};
126+
123127
"
124128
).unwrap();
125129
}

src/error/sqlstate.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Autogenerated file - DO NOT EDIT
22
use phf;
3+
34
/// SQLSTATE error codes
45
#[derive(PartialEq, Eq, Clone, Debug)]
56
pub enum SqlState {

0 commit comments

Comments
 (0)