Skip to content

Commit 00360bc

Browse files
committed
Delete no_group_open_close config for rustc older than 1.55
1 parent 346cc05 commit 00360bc

File tree

3 files changed

+2
-28
lines changed

3 files changed

+2
-28
lines changed

build.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ fn main() {
5858
println!("cargo:rustc-cfg=span_locations");
5959
}
6060

61-
if version.minor < 55 {
62-
println!("cargo:rustc-cfg=no_group_open_close");
63-
}
64-
6561
if version.minor < 57 {
6662
println!("cargo:rustc-cfg=no_is_available");
6763
}

src/extra.rs

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ enum DelimSpanEnum {
2222
#[cfg(wrap_proc_macro)]
2323
Compiler {
2424
join: proc_macro::Span,
25-
#[cfg(not(no_group_open_close))]
2625
open: proc_macro::Span,
27-
#[cfg(not(no_group_open_close))]
2826
close: proc_macro::Span,
2927
},
3028
Fallback(fallback::Span),
@@ -36,9 +34,7 @@ impl DelimSpan {
3634
let inner = match group {
3735
imp::Group::Compiler(group) => DelimSpanEnum::Compiler {
3836
join: group.span(),
39-
#[cfg(not(no_group_open_close))]
4037
open: group.span_open(),
41-
#[cfg(not(no_group_open_close))]
4238
close: group.span_close(),
4339
},
4440
imp::Group::Fallback(group) => DelimSpanEnum::Fallback(group.span()),
@@ -66,13 +62,7 @@ impl DelimSpan {
6662
pub fn open(&self) -> Span {
6763
match &self.inner {
6864
#[cfg(wrap_proc_macro)]
69-
DelimSpanEnum::Compiler {
70-
#[cfg(not(no_group_open_close))]
71-
open,
72-
#[cfg(no_group_open_close)]
73-
join: open,
74-
..
75-
} => Span::_new(imp::Span::Compiler(*open)),
65+
DelimSpanEnum::Compiler { open, .. } => Span::_new(imp::Span::Compiler(*open)),
7666
DelimSpanEnum::Fallback(span) => Span::_new_fallback(span.first_byte()),
7767
}
7868
}
@@ -81,13 +71,7 @@ impl DelimSpan {
8171
pub fn close(&self) -> Span {
8272
match &self.inner {
8373
#[cfg(wrap_proc_macro)]
84-
DelimSpanEnum::Compiler {
85-
#[cfg(not(no_group_open_close))]
86-
close,
87-
#[cfg(no_group_open_close)]
88-
join: close,
89-
..
90-
} => Span::_new(imp::Span::Compiler(*close)),
74+
DelimSpanEnum::Compiler { close, .. } => Span::_new(imp::Span::Compiler(*close)),
9175
DelimSpanEnum::Fallback(span) => Span::_new_fallback(span.last_byte()),
9276
}
9377
}

src/wrapper.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -580,20 +580,14 @@ impl Group {
580580

581581
pub fn span_open(&self) -> Span {
582582
match self {
583-
#[cfg(not(no_group_open_close))]
584583
Group::Compiler(g) => Span::Compiler(g.span_open()),
585-
#[cfg(no_group_open_close)]
586-
Group::Compiler(g) => Span::Compiler(g.span()),
587584
Group::Fallback(g) => Span::Fallback(g.span_open()),
588585
}
589586
}
590587

591588
pub fn span_close(&self) -> Span {
592589
match self {
593-
#[cfg(not(no_group_open_close))]
594590
Group::Compiler(g) => Span::Compiler(g.span_close()),
595-
#[cfg(no_group_open_close)]
596-
Group::Compiler(g) => Span::Compiler(g.span()),
597591
Group::Fallback(g) => Span::Fallback(g.span_close()),
598592
}
599593
}

0 commit comments

Comments
 (0)