Skip to content

Commit 456ffcd

Browse files
committed
Revert "Register new snapshots"
This reverts commit 9b44328.
1 parent 84a7615 commit 456ffcd

File tree

3 files changed

+53
-12
lines changed

3 files changed

+53
-12
lines changed

src/libcore/ops.rs

+50
Original file line numberDiff line numberDiff line change
@@ -832,3 +832,53 @@ impl<F,A,R> FnOnce<A,R> for F
832832
self.call_mut(args)
833833
}
834834
}
835+
836+
#[cfg(stage0)]
837+
mod fn_impls {
838+
use super::Fn;
839+
840+
impl<Result> Fn<(),Result> for extern "Rust" fn() -> Result {
841+
#[allow(non_snake_case)]
842+
extern "rust-call" fn call(&self, _args: ()) -> Result {
843+
(*self)()
844+
}
845+
}
846+
847+
impl<Result,A0> Fn<(A0,),Result> for extern "Rust" fn(A0) -> Result {
848+
#[allow(non_snake_case)]
849+
extern "rust-call" fn call(&self, args: (A0,)) -> Result {
850+
let (a0,) = args;
851+
(*self)(a0)
852+
}
853+
}
854+
855+
macro_rules! def_fn(
856+
($($args:ident)*) => (
857+
impl<Result$(,$args)*>
858+
Fn<($($args,)*),Result>
859+
for extern "Rust" fn($($args: $args,)*) -> Result {
860+
#[allow(non_snake_case)]
861+
extern "rust-call" fn call(&self, args: ($($args,)*)) -> Result {
862+
let ($($args,)*) = args;
863+
(*self)($($args,)*)
864+
}
865+
}
866+
)
867+
)
868+
869+
def_fn!(A0 A1)
870+
def_fn!(A0 A1 A2)
871+
def_fn!(A0 A1 A2 A3)
872+
def_fn!(A0 A1 A2 A3 A4)
873+
def_fn!(A0 A1 A2 A3 A4 A5)
874+
def_fn!(A0 A1 A2 A3 A4 A5 A6)
875+
def_fn!(A0 A1 A2 A3 A4 A5 A6 A7)
876+
def_fn!(A0 A1 A2 A3 A4 A5 A6 A7 A8)
877+
def_fn!(A0 A1 A2 A3 A4 A5 A6 A7 A8 A9)
878+
def_fn!(A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 A10)
879+
def_fn!(A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 A10 A11)
880+
def_fn!(A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 A10 A11 A12)
881+
def_fn!(A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 A10 A11 A12 A13)
882+
def_fn!(A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 A10 A11 A12 A13 A14)
883+
def_fn!(A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 A10 A11 A12 A13 A14 A15)
884+
}

src/libsyntax/parse/lexer/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@ impl<'a> StringReader<'a> {
763763
}
764764
}
765765

766-
// SNAP 361baab
766+
// SNAP c9f6d69
767767
#[allow(unused)]
768768
fn old_escape_warning(&mut self, sp: Span) {
769769
self.span_diagnostic
@@ -796,15 +796,15 @@ impl<'a> StringReader<'a> {
796796
self.scan_unicode_escape(delim)
797797
} else {
798798
let res = self.scan_hex_digits(4u, delim, false);
799-
// SNAP 361baab
799+
// SNAP c9f6d69
800800
//let sp = codemap::mk_sp(escaped_pos, self.last_pos);
801801
//self.old_escape_warning(sp);
802802
res
803803
}
804804
}
805805
'U' if !ascii_only => {
806806
let res = self.scan_hex_digits(8u, delim, false);
807-
// SNAP 361baab
807+
// SNAP c9f6d69
808808
//let sp = codemap::mk_sp(escaped_pos, self.last_pos);
809809
//self.old_escape_warning(sp);
810810
res

src/snapshots.txt

-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
S 2014-12-05 361baab
2-
freebsd-x86_64 73cbae4168538a07facd81cca45ed672badb7c3a
3-
linux-i386 211cf0fbdbc7045b765e7b92d92049bbe6788513
4-
linux-x86_64 f001cec306fc1ac77504884acf5dac2e7b39e164
5-
macos-i386 751dc02fac96114361c56eb45ce52e7a58d555e0
6-
macos-x86_64 58cad0275d7b33412501d7dd3386b924d2304e83
7-
winnt-i386 872c56b88cebd7d590fd00bcbd264f0003b4427b
8-
winnt-x86_64 2187d8b3187c03f95cd4e56a582f55ec0cfa8df9
9-
101
S 2014-11-21 c9f6d69
112
freebsd-x86_64 0ef316e7c369177de043e69e964418bd637cbfc0
123
linux-i386 c8342e762a1720be939ed7c6a39bdaa27892f66f

0 commit comments

Comments
 (0)