openharmony/third_party_rust_proc-macro2
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_rust_proc-macro2 synced 2024-11-23 15:29:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove the now-unnecessary memchr dependency

Browse Source
This commit is contained in:
Nika Layzell 2017-12-30 14:52:39 -05:00
parent a9dbc1848b
commit a0a7c3d27f
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -19,7 +19,6 @@ doctest = false
[dependencies]
unicode-xid = "0.1"
memchr = "2.0"
[features]
unstable = []

3
src/lib.rs
View File

@ -23,9 +23,6 @@
extern crate proc_macro;
#[cfg(not(feature = "unstable"))]
extern crate memchr;
#[cfg(not(feature = "unstable"))]
extern crate unicode_xid;

8
src/stable.rs
View File

@ -12,8 +12,6 @@ use std::rc::Rc;
use std::str::FromStr;
use std::vec;
#[cfg(procmacro2_unstable)]
use memchr;
use proc_macro;
use unicode_xid::UnicodeXID;
use strnom::{Cursor, PResult, skip_whitespace, block_comment, whitespace, word_break};
@ -264,10 +262,10 @@ impl FileInfo {
/// Computes the offsets of each line in the given source string.
#[cfg(procmacro2_unstable)]
fn lines_offsets(s: &[u8]) -> Vec<usize> {
fn lines_offsets(s: &str) -> Vec<usize> {
let mut lines = vec![0];
let mut prev = 0;
while let Some(len) = memchr::memchr(b'\n', &s[prev..]) {
while let Some(len) = s[prev..].find('\n') {
prev += len + 1;
lines.push(prev);
}
@ -290,7 +288,7 @@ impl Codemap {
}
fn add_file(&mut self, name: &str, src: &str) -> Span {
let lines = lines_offsets(src.as_bytes());
let lines = lines_offsets(src);
let lo = self.next_start_pos();
// XXX(nika): Shouild we bother doing a checked cast or checked add here?
let span = Span { lo: lo, hi: lo + (src.len() as u32) };