Skip to content

Commit 69a3168

Browse files
borsbors
committed
---
yaml --- r: 274430 b: refs/heads/stable c: 28bed3f h: refs/heads/master
1 parent a07b4d4 commit 69a3168

25 files changed

+209
-52
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: e768fa729fb21549a39744bd3bfad03643cc10da
32+
refs/heads/stable: 28bed3f5e64dfc083dc193412b65d95533a61d72
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

‎branches/stable/configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@ do
11641164
;;
11651165

11661166

1167-
*-musl)
1167+
x86_64-*-musl)
11681168
if [ ! -f $CFG_MUSL_ROOT/lib/libc.a ]
11691169
then
11701170
err "musl libc $CFG_MUSL_ROOT/lib/libc.a not found"

‎branches/stable/mk/cfg/armv7-unknown-linux-gnueabihf.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ CFG_LIB_NAME_armv7-unknown-linux-gnueabihf=lib$(1).so
88
CFG_STATIC_LIB_NAME_armv7-unknown-linux-gnueabihf=lib$(1).a
99
CFG_LIB_GLOB_armv7-unknown-linux-gnueabihf=lib$(1)-*.so
1010
CFG_LIB_DSYM_GLOB_armv7-unknown-linux-gnueabihf=lib$(1)-*.dylib.dSYM
11-
CFG_JEMALLOC_CFLAGS_armv7-unknown-linux-gnueabihf := -D__arm__ $(CFLAGS) -march=armv7
12-
CFG_GCCISH_CFLAGS_armv7-unknown-linux-gnueabihf := -Wall -g -fPIC -D__arm__ $(CFLAGS) -march=armv7
11+
CFG_JEMALLOC_CFLAGS_armv7-unknown-linux-gnueabihf := -D__arm__ $(CFLAGS) -march=armv7-a
12+
CFG_GCCISH_CFLAGS_armv7-unknown-linux-gnueabihf := -Wall -g -fPIC -D__arm__ $(CFLAGS) -march=armv7-a
1313
CFG_GCCISH_CXXFLAGS_armv7-unknown-linux-gnueabihf := -fno-rtti $(CXXFLAGS)
1414
CFG_GCCISH_LINK_FLAGS_armv7-unknown-linux-gnueabihf := -shared -fPIC -g
1515
CFG_GCCISH_DEF_FLAG_armv7-unknown-linux-gnueabihf := -Wl,--export-dynamic,--dynamic-list=

‎branches/stable/mk/cfg/mips-unknown-linux-gnu.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ CFG_UNIXY_mips-unknown-linux-gnu := 1
2020
CFG_LDPATH_mips-unknown-linux-gnu :=
2121
CFG_RUN_mips-unknown-linux-gnu=
2222
CFG_RUN_TARG_mips-unknown-linux-gnu=
23-
RUSTC_FLAGS_mips-unknown-linux-gnu := -C target-cpu=mips32r2 -C target-feature="+mips32r2" -C soft-float
23+
RUSTC_FLAGS_mips-unknown-linux-gnu :=
2424
CFG_GNU_TRIPLE_mips-unknown-linux-gnu := mips-unknown-linux-gnu

‎branches/stable/mk/cfg/mips-unknown-linux-musl.mk

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# mips-unknown-linux-musl configuration
2+
CC_mips-unknown-linux-musl=mips-linux-musl-gcc
3+
CXX_mips-unknown-linux-musl=mips-linux-musl-g++
4+
CPP_mips-unknown-linux-musl=mips-linux-musl-gcc -E
5+
AR_mips-unknown-linux-musl=mips-linux-musl-ar
6+
CFG_LIB_NAME_mips-unknown-linux-musl=lib$(1).so
7+
CFG_STATIC_LIB_NAME_mips-unknown-linux-musl=lib$(1).a
8+
CFG_LIB_GLOB_mips-unknown-linux-musl=lib$(1)-*.so
9+
CFG_LIB_DSYM_GLOB_mips-unknown-linux-musl=lib$(1)-*.dylib.dSYM
10+
CFG_JEMALLOC_CFLAGS_mips-unknown-linux-musl := -mips32r2 -msoft-float -mabi=32 $(CFLAGS)
11+
CFG_GCCISH_CFLAGS_mips-unknown-linux-musl := -Wall -g -fPIC -mips32r2 -msoft-float -mabi=32 $(CFLAGS)
12+
CFG_GCCISH_CXXFLAGS_mips-unknown-linux-musl := -fno-rtti $(CXXFLAGS)
13+
CFG_GCCISH_LINK_FLAGS_mips-unknown-linux-musl := -shared -fPIC -g -mips32r2 -msoft-float -mabi=32
14+
CFG_GCCISH_DEF_FLAG_mips-unknown-linux-musl := -Wl,--export-dynamic,--dynamic-list=
15+
CFG_LLC_FLAGS_mips-unknown-linux-musl :=
16+
CFG_INSTALL_NAME_mips-unknown-linux-musl =
17+
CFG_EXE_SUFFIX_mips-unknown-linux-musl =
18+
CFG_WINDOWSY_mips-unknown-linux-musl :=
19+
CFG_UNIXY_mips-unknown-linux-musl := 1
20+
CFG_LDPATH_mips-unknown-linux-musl :=
21+
CFG_RUN_mips-unknown-linux-musl=
22+
CFG_RUN_TARG_mips-unknown-linux-musl=
23+
RUSTC_FLAGS_mips-unknown-linux-musl :=
24+
CFG_GNU_TRIPLE_mips-unknown-linux-musl := mips-unknown-linux-musl

‎branches/stable/mk/cfg/mipsel-unknown-linux-gnu.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ CFG_UNIXY_mipsel-unknown-linux-gnu := 1
2020
CFG_LDPATH_mipsel-unknown-linux-gnu :=
2121
CFG_RUN_mipsel-unknown-linux-gnu=
2222
CFG_RUN_TARG_mipsel-unknown-linux-gnu=
23-
RUSTC_FLAGS_mipsel-unknown-linux-gnu := -C target-cpu=mips32 -C target-feature="+mips32"
23+
RUSTC_FLAGS_mipsel-unknown-linux-gnu :=
2424
CFG_GNU_TRIPLE_mipsel-unknown-linux-gnu := mipsel-unknown-linux-gnu

‎branches/stable/mk/cfg/mipsel-unknown-linux-musl.mk

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# mipsel-unknown-linux-musl configuration
2+
CC_mipsel-unknown-linux-musl=mipsel-linux-musl-gcc
3+
CXX_mipsel-unknown-linux-musl=mipsel-linux-musl-g++
4+
CPP_mipsel-unknown-linux-musl=mipsel-linux-musl-gcc
5+
AR_mipsel-unknown-linux-musl=mipsel-linux-musl-ar
6+
CFG_LIB_NAME_mipsel-unknown-linux-musl=lib$(1).so
7+
CFG_STATIC_LIB_NAME_mipsel-unknown-linux-musl=lib$(1).a
8+
CFG_LIB_GLOB_mipsel-unknown-linux-musl=lib$(1)-*.so
9+
CFG_LIB_DSYM_GLOB_mipsel-unknown-linux-musl=lib$(1)-*.dylib.dSYM
10+
CFG_JEMALLOC_CFLAGS_mipsel-unknown-linux-musl := -mips32 -mabi=32 $(CFLAGS)
11+
CFG_GCCISH_CFLAGS_mipsel-unknown-linux-musl := -Wall -g -fPIC -mips32 -mabi=32 $(CFLAGS)
12+
CFG_GCCISH_CXXFLAGS_mipsel-unknown-linux-musl := -fno-rtti $(CXXFLAGS)
13+
CFG_GCCISH_LINK_FLAGS_mipsel-unknown-linux-musl := -shared -fPIC -g -mips32
14+
CFG_GCCISH_DEF_FLAG_mipsel-unknown-linux-musl := -Wl,--export-dynamic,--dynamic-list=
15+
CFG_LLC_FLAGS_mipsel-unknown-linux-musl :=
16+
CFG_INSTALL_NAME_mipsel-unknown-linux-musl =
17+
CFG_EXE_SUFFIX_mipsel-unknown-linux-musl :=
18+
CFG_WINDOWSY_mipsel-unknown-linux-musl :=
19+
CFG_UNIXY_mipsel-unknown-linux-musl := 1
20+
CFG_LDPATH_mipsel-unknown-linux-musl :=
21+
CFG_RUN_mipsel-unknown-linux-musl=
22+
CFG_RUN_TARG_mipsel-unknown-linux-musl=
23+
RUSTC_FLAGS_mipsel-unknown-linux-musl :=
24+
CFG_GNU_TRIPLE_mipsel-unknown-linux-musl := mipsel-unknown-linux-musl

‎branches/stable/src/liblibc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 91ff43c736de664f8d3cd351e148c09cdea6731e
1+
Subproject commit 30f70baa6cc1ba3ddebb55b988fafbad0c0cc810

‎branches/stable/src/librustc_back/target/armv7_unknown_linux_gnueabihf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pub fn target() -> Target {
2323

2424
options: TargetOptions {
2525
features: "+v7,+vfp2,+neon".to_string(),
26-
cpu: "cortex-a7".to_string(),
26+
cpu: "cortex-a8".to_string(),
2727
.. base
2828
}
2929
}

‎branches/stable/src/librustc_back/target/mips_unknown_linux_gnu.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use target::Target;
11+
use target::{Target, TargetOptions};
1212

1313
pub fn target() -> Target {
1414
Target {
@@ -19,6 +19,10 @@ pub fn target() -> Target {
1919
target_os: "linux".to_string(),
2020
target_env: "gnu".to_string(),
2121
target_vendor: "unknown".to_string(),
22-
options: super::linux_base::opts()
22+
options: TargetOptions {
23+
cpu: "mips32r2".to_string(),
24+
features: "+mips32r2,+soft-float".to_string(),
25+
..super::linux_base::opts()
26+
},
2327
}
2428
}

‎branches/stable/src/librustc_back/target/mips_unknown_linux_musl.rs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
use target::{Target, TargetOptions};
12+
13+
pub fn target() -> Target {
14+
Target {
15+
llvm_target: "mips-unknown-linux-musl".to_string(),
16+
target_endian: "big".to_string(),
17+
target_pointer_width: "32".to_string(),
18+
arch: "mips".to_string(),
19+
target_os: "linux".to_string(),
20+
target_env: "musl".to_string(),
21+
target_vendor: "unknown".to_string(),
22+
options: TargetOptions {
23+
cpu: "mips32r2".to_string(),
24+
features: "+mips32r2,+soft-float".to_string(),
25+
..super::linux_base::opts()
26+
}
27+
}
28+
}

‎branches/stable/src/librustc_back/target/mipsel_unknown_linux_gnu.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use target::Target;
11+
use target::{Target, TargetOptions};
1212

1313
pub fn target() -> Target {
1414
Target {
@@ -20,6 +20,10 @@ pub fn target() -> Target {
2020
target_env: "gnu".to_string(),
2121
target_vendor: "unknown".to_string(),
2222

23-
options: super::linux_base::opts()
23+
options: TargetOptions {
24+
cpu: "mips32".to_string(),
25+
features: "+mips32".to_string(),
26+
..super::linux_base::opts()
27+
},
2428
}
2529
}

‎branches/stable/src/librustc_back/target/mipsel_unknown_linux_musl.rs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
use target::{Target, TargetOptions};
12+
13+
pub fn target() -> Target {
14+
Target {
15+
llvm_target: "mipsel-unknown-linux-musl".to_string(),
16+
target_endian: "little".to_string(),
17+
target_pointer_width: "32".to_string(),
18+
arch: "mips".to_string(),
19+
target_os: "linux".to_string(),
20+
target_env: "musl".to_string(),
21+
target_vendor: "unknown".to_string(),
22+
options: TargetOptions {
23+
cpu: "mips32".to_string(),
24+
features: "+mips32".to_string(),
25+
..super::linux_base::opts()
26+
}
27+
}
28+
}

‎branches/stable/src/librustc_back/target/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,8 @@ impl Target {
420420
armv7_unknown_linux_gnueabihf,
421421
aarch64_unknown_linux_gnu,
422422
x86_64_unknown_linux_musl,
423+
mips_unknown_linux_musl,
424+
mipsel_unknown_linux_musl,
423425

424426
i686_linux_android,
425427
arm_linux_androideabi,

‎branches/stable/src/librustc_resolve/check_unused.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ impl<'a, 'b, 'v, 'tcx> Visitor<'v> for UnusedImportCheckVisitor<'a, 'b, 'tcx> {
117117
// whether they're used or not. Also ignore imports with a dummy span
118118
// because this means that they were generated in some fashion by the
119119
// compiler and we don't need to consider them.
120-
if item.vis == hir::Public || item.span == DUMMY_SP {
120+
if item.vis == hir::Public || item.span.source_equal(&DUMMY_SP) {
121121
return;
122122
}
123123

‎branches/stable/src/librustc_resolve/resolve_imports.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -793,9 +793,6 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
793793
dest_import_resolution.is_public = is_public;
794794
self.add_export(module_, name, &dest_import_resolution);
795795
}
796-
} else {
797-
// FIXME #30159: This is required for backwards compatability.
798-
dest_import_resolution.is_public |= is_public;
799796
}
800797

801798
self.check_for_conflicts_between_imports_and_items(module_,

‎branches/stable/src/librustc_typeck/check/mod.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4250,14 +4250,9 @@ pub fn check_enum_variants<'a,'tcx>(ccx: &CrateCtxt<'a,'tcx>,
42504250
let def_id = ccx.tcx.map.local_def_id(id);
42514251
let hint = *ccx.tcx.lookup_repr_hints(def_id).get(0).unwrap_or(&attr::ReprAny);
42524252

4253-
if hint != attr::ReprAny && vs.len() <= 1 {
4254-
if vs.len() == 1 {
4255-
span_err!(ccx.tcx.sess, sp, E0083,
4256-
"unsupported representation for univariant enum");
4257-
} else {
4258-
span_err!(ccx.tcx.sess, sp, E0084,
4259-
"unsupported representation for zero-variant enum");
4260-
};
4253+
if hint != attr::ReprAny && vs.is_empty() {
4254+
span_err!(ccx.tcx.sess, sp, E0084,
4255+
"unsupported representation for zero-variant enum");
42614256
}
42624257

42634258
do_check(ccx, vs, id, hint);

‎branches/stable/src/librustc_typeck/diagnostics.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,13 +1062,6 @@ Note also that without a representation manually defined, the compiler will
10621062
optimize by using the smallest integer type possible.
10631063
"##,
10641064

1065-
E0083: r##"
1066-
At present, it's not possible to define a custom representation for an enum with
1067-
a single variant. As a workaround you can add a `Dummy` variant.
1068-
1069-
See: https://github.com/rust-lang/rust/issues/10292
1070-
"##,
1071-
10721065
E0084: r##"
10731066
It is impossible to define an integer type to be used to represent zero-variant
10741067
enum values because there are no zero-variant enum values. There is no way to

‎branches/stable/src/libstd/os/linux/raw.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,20 @@ mod arch {
9393
use os::raw::{c_long, c_ulong};
9494
use os::unix::raw::{gid_t, uid_t};
9595

96+
#[cfg(target_env = "musl")]
97+
#[stable(feature = "raw_ext", since = "1.1.0")] pub type blkcnt_t = i64;
98+
#[cfg(not(target_env = "musl"))]
9699
#[stable(feature = "raw_ext", since = "1.1.0")] pub type blkcnt_t = i32;
97100
#[stable(feature = "raw_ext", since = "1.1.0")] pub type blksize_t = i32;
101+
#[cfg(target_env = "musl")]
102+
#[stable(feature = "raw_ext", since = "1.1.0")] pub type ino_t = u64;
103+
#[cfg(not(target_env = "musl"))]
98104
#[stable(feature = "raw_ext", since = "1.1.0")] pub type ino_t = u32;
99105
#[stable(feature = "raw_ext", since = "1.1.0")] pub type nlink_t = u32;
106+
#[cfg(target_env = "musl")]
100107
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = i32;
108+
#[cfg(not(target_env = "musl"))]
109+
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = i64;
101110
#[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i32;
102111

103112
#[repr(C)]

‎branches/stable/src/libstd/sys/common/libunwind.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,10 @@ pub type _Unwind_Exception_Cleanup_Fn =
101101
exception: *mut _Unwind_Exception);
102102

103103
#[cfg_attr(any(all(target_os = "linux", not(target_env = "musl")),
104-
target_os = "freebsd"),
104+
target_os = "freebsd",
105+
all(target_os = "linux", target_env = "musl", not(target_arch = "x86_64"))),
105106
link(name = "gcc_s"))]
106-
#[cfg_attr(all(target_os = "linux", target_env = "musl", not(test)),
107+
#[cfg_attr(all(target_os = "linux", target_env = "musl", target_arch = "x86_64", not(test)),
107108
link(name = "unwind", kind = "static"))]
108109
#[cfg_attr(any(target_os = "android", target_os = "openbsd"),
109110
link(name = "gcc"))]

‎branches/stable/src/libsyntax/ast_util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ pub fn pat_is_ident(pat: P<ast::Pat>) -> bool {
356356
// since I'm using this to replace ==, it seems appropriate
357357
// to compare the span, global, etc. fields as well.
358358
pub fn path_name_eq(a : &ast::Path, b : &ast::Path) -> bool {
359-
(a.span == b.span)
359+
(a.span.source_equal(&b.span))
360360
&& (a.global == b.global)
361361
&& (segments_name_eq(&a.segments[..], &b.segments[..]))
362362
}

‎branches/stable/src/libsyntax/codemap.rs

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ impl Sub for CharPos {
123123
/// able to use many of the functions on spans in codemap and you cannot assume
124124
/// that the length of the span = hi - lo; there may be space in the BytePos
125125
/// range between files.
126-
#[derive(Clone, Copy, Hash)]
126+
#[derive(Clone, Copy, Hash, PartialEq, Eq)]
127127
pub struct Span {
128128
pub lo: BytePos,
129129
pub hi: BytePos,
@@ -151,13 +151,21 @@ pub const COMMAND_LINE_SP: Span = Span { lo: BytePos(0),
151151
impl Span {
152152
/// Returns `self` if `self` is not the dummy span, and `other` otherwise.
153153
pub fn substitute_dummy(self, other: Span) -> Span {
154-
if self == DUMMY_SP { other } else { self }
154+
if self.source_equal(&DUMMY_SP) { other } else { self }
155155
}
156156

157157
pub fn contains(self, other: Span) -> bool {
158158
self.lo <= other.lo && other.hi <= self.hi
159159
}
160160

161+
/// Return true if the spans are equal with regards to the source text.
162+
///
163+
/// Use this instead of `==` when either span could be generated code,
164+
/// and you only care that they point to the same bytes of source text.
165+
pub fn source_equal(&self, other: &Span) -> bool {
166+
self.lo == other.lo && self.hi == other.hi
167+
}
168+
161169
/// Returns `Some(span)`, a union of `self` and `other`, on overlap.
162170
pub fn merge(self, other: Span) -> Option<Span> {
163171
if self.expn_id != other.expn_id {
@@ -192,15 +200,6 @@ pub struct Spanned<T> {
192200
pub span: Span,
193201
}
194202

195-
impl PartialEq for Span {
196-
fn eq(&self, other: &Span) -> bool {
197-
return (*self).lo == (*other).lo && (*self).hi == (*other).hi;
198-
}
199-
fn ne(&self, other: &Span) -> bool { !(*self).eq(other) }
200-
}
201-
202-
impl Eq for Span {}
203-
204203
impl Encodable for Span {
205204
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
206205
s.emit_struct("Span", 2, |s| {
@@ -940,7 +939,7 @@ impl CodeMap {
940939
}
941940

942941
pub fn span_to_string(&self, sp: Span) -> String {
943-
if self.files.borrow().is_empty() && sp == DUMMY_SP {
942+
if self.files.borrow().is_empty() && sp.source_equal(&DUMMY_SP) {
944943
return "no-location".to_string();
945944
}
946945

@@ -1307,7 +1306,7 @@ impl CodeMap {
13071306
expninfo.map_or(/* hit the top level */ true, |info| {
13081307

13091308
let span_comes_from_this_expansion =
1310-
info.callee.span.map_or(span == info.call_site, |mac_span| {
1309+
info.callee.span.map_or(span.source_equal(&info.call_site), |mac_span| {
13111310
mac_span.contains(span)
13121311
});
13131312

0 commit comments

Comments
 (0)