traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into tags

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

3
Cargo.lock generated
View file

@ -736,9 +736,6 @@ version = "0.6.3"
dependencies = [
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]

5
cli/src/tests/parser_test.rs
View file

@ -450,7 +450,7 @@ fn test_parsing_on_multiple_threads() {
#[test]
fn test_parsing_cancelled_by_another_thread() {
let cancellation_flag = Box::new(AtomicUsize::new(0));
let cancellation_flag = std::sync::Arc::new(AtomicUsize::new(0));
let mut parser = Parser::new();
parser.set_language(get_language("javascript")).unwrap();
@ -471,9 +471,10 @@ fn test_parsing_cancelled_by_another_thread() {
);
assert!(tree.is_some());
let flag = cancellation_flag.clone();
let cancel_thread = thread::spawn(move || {
thread::sleep(time::Duration::from_millis(100));
cancellation_flag.store(1, Ordering::SeqCst);
flag.store(1, Ordering::SeqCst);
});
// Infinite input

3
lib/Cargo.toml
View file

@ -20,9 +20,6 @@ include = [
[dependencies]
regex = "1"
serde = "1.0"
serde_json = "1.0"
serde_derive = "1.0"
[build-dependencies]
cc = "1.0"

4
lib/binding_rust/bindings.rs
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`"]

9
lib/binding_rust/lib.rs
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,