mirror of
https://github.com/nushell/nushell.git
synced 2025-06-30 22:50:14 +02:00
Bump roxmltree
to 0.19 (#11876)
Manual changes to adapt to new error variants. Error text adapted from docs. Supersedes #11605
This commit is contained in:
committed by
GitHub
parent
1b220815b9
commit
7f1e025cc9
@ -71,7 +71,7 @@ quick-xml = "0.31.0"
|
||||
rand = "0.8"
|
||||
rayon = "1.8"
|
||||
regex = "1.9.5"
|
||||
roxmltree = "0.18"
|
||||
roxmltree = "0.19"
|
||||
rusqlite = { version = "0.29", features = ["bundled", "backup", "chrono"], optional = true }
|
||||
same-file = "1.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
|
@ -280,7 +280,39 @@ fn process_xml_parse_error(err: roxmltree::Error, span: Span) -> ShellError {
|
||||
roxmltree::Error::NamespacesLimitReached => {
|
||||
make_cant_convert_error("Namespace limit reached", span)
|
||||
}
|
||||
roxmltree::Error::ParserError(_) => make_cant_convert_error("Parser error", span),
|
||||
roxmltree::Error::UnexpectedDeclaration(_) => {
|
||||
make_cant_convert_error("An XML document can have only one XML declaration and it must be at the start of the document.", span)
|
||||
}
|
||||
roxmltree::Error::InvalidName(_) => {
|
||||
make_cant_convert_error("Invalid name found.", span)
|
||||
}
|
||||
roxmltree::Error::NonXmlChar(_, _) => {
|
||||
make_cant_convert_error("A non-XML character has occurred. Valid characters are: <https://www.w3.org/TR/xml/#char32>", span)
|
||||
}
|
||||
roxmltree::Error::InvalidChar(_, _, _) => {
|
||||
make_cant_convert_error("An invalid/unexpected character in XML.", span)
|
||||
}
|
||||
roxmltree::Error::InvalidChar2(_, _, _) => {
|
||||
make_cant_convert_error("An invalid/unexpected character in XML.", span)
|
||||
}
|
||||
roxmltree::Error::InvalidString(_, _) => {
|
||||
make_cant_convert_error("An invalid/unexpected string in XML.", span)
|
||||
}
|
||||
roxmltree::Error::InvalidExternalID(_) => {
|
||||
make_cant_convert_error("An invalid ExternalID in the DTD.", span)
|
||||
}
|
||||
roxmltree::Error::InvalidComment(_) => {
|
||||
make_cant_convert_error("A comment cannot contain `--` or end with `-`.", span)
|
||||
}
|
||||
roxmltree::Error::InvalidCharacterData(_) => {
|
||||
make_cant_convert_error("A Character Data node contains an invalid data. Currently, only `]]>` is not allowed.", span)
|
||||
}
|
||||
roxmltree::Error::UnknownToken(_) => {
|
||||
make_cant_convert_error("Unknown token in XML.", span)
|
||||
}
|
||||
roxmltree::Error::UnexpectedEndOfStream => {
|
||||
make_cant_convert_error("Unexpected end of stream while parsing XML.", span)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user