Skip to content

Commit 6e9d4cd

Browse files
author
Ulrik Sverdrup
committed
---
yaml --- r: 210207 b: refs/heads/try c: da03c9d h: refs/heads/master i: 210205: 90b229a 210203: 03f2a5a 210199: c7adb9d 210191: a09743f 210175: 7e6822d v: v3
1 parent a722733 commit 6e9d4cd

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
5-
refs/heads/try: ee48e6d192166be08a57dc4f5ba14256c072e9c3
5+
refs/heads/try: da03c9df33177d77029c52f8a68a5d214a6e83c7
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/libsyntax/codemap.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -543,21 +543,17 @@ impl CodeMap {
543543
}
544544
}
545545

546-
pub fn new_filemap(&self, filename: FileName, src: String) -> Rc<FileMap> {
546+
pub fn new_filemap(&self, filename: FileName, mut src: String) -> Rc<FileMap> {
547547
let mut files = self.files.borrow_mut();
548548
let start_pos = match files.last() {
549549
None => 0,
550550
Some(last) => last.end_pos.to_usize(),
551551
};
552552

553553
// Remove utf-8 BOM if any.
554-
// FIXME #12884: no efficient/safe way to remove from the start of a string
555-
// and reuse the allocation.
556-
let mut src = if src.starts_with("\u{feff}") {
557-
String::from(&src[3..])
558-
} else {
559-
String::from(&src[..])
560-
};
554+
if src.starts_with("\u{feff}") {
555+
src.drain(..3);
556+
}
561557

562558
// Append '\n' in case it's not already there.
563559
// This is a workaround to prevent CodeMap.lookup_filemap_idx from

branches/try/src/libsyntax/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
#![feature(associated_consts)]
2929
#![feature(collections)]
30+
#![feature(collections_drain)]
3031
#![feature(core)]
3132
#![feature(libc)]
3233
#![feature(rustc_private)]

0 commit comments

Comments
 (0)