Merge branch 'master' into tags

This commit is contained in:
Max Brunsfeld 2020-03-25 12:49:15 -07:00
commit 8eac81b8df
5 changed files with 7 additions and 17 deletions

View file

@ -172,9 +172,9 @@ extern "C" {
#[doc = " the given ranges must be ordered from earliest to latest in the document,"]
#[doc = " and they must not overlap. That is, the following must hold for all"]
#[doc = " `i` < `length - 1`:"]
#[doc = ""]
#[doc = " ```text"]
#[doc = " ranges[i].end_byte <= ranges[i + 1].start_byte"]
#[doc = ""]
#[doc = " ```"]
#[doc = " If this requirement is not satisfied, the operation will fail, the ranges"]
#[doc = " will not be assigned, and this function will return `false`. On success,"]
#[doc = " this function returns `true`"]

View file

@ -1,11 +1,6 @@
mod ffi;
mod util;
extern crate regex;
extern crate serde;
extern crate serde_derive;
extern crate serde_json;
#[cfg(unix)]
use std::os::unix::io::AsRawFd;
@ -555,9 +550,9 @@ impl Parser {
/// the given ranges must be ordered from earliest to latest in the document,
/// and they must not overlap. That is, the following must hold for all
/// `i` < `length - 1`:
///
/// ```text
/// ranges[i].end_byte <= ranges[i + 1].start_byte
///
/// ```
/// If this requirement is not satisfied, method will panic.
pub fn set_included_ranges<'a>(
&mut self,