Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 9 pull requests #50290

Merged
merged 30 commits into from
Apr 27, 2018
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f817d19
std: Mark `ptr::Unique` with `#[doc(hidden)]`
Apr 10, 2018
54d6bcb
alloc: Mark `Box::into_unique` with `#[doc(hidden)]`
Apr 11, 2018
d2dc21d
Add documentation for SyntaxContext::remove_mark
sapphire-arches Apr 21, 2018
263b36b
Implement parent() on `syntax_pos::Span`
sapphire-arches Apr 21, 2018
498dbe4
Implement a least upper bound for marks.
sapphire-arches Apr 21, 2018
a2a9cc6
rustc: Disable threads in LLD for wasm
alexcrichton Apr 26, 2018
d92d193
Don't ICE on tuple struct ctor with incorrect arg count
estebank Apr 26, 2018
73e0c1e
Fix review nits
sapphire-arches Apr 26, 2018
20ad427
rustc: Emit `uwtable` for allocator shims
alexcrichton Apr 27, 2018
3565556
Update `parking_lot` dependencies
alexcrichton Apr 27, 2018
5f2c111
Allow #[inline] on closures
Amanieu Apr 27, 2018
199ee32
stop requiring the feature-gate to use dyn_trait
pvdrz Apr 12, 2018
c86f1c8
removed dyn_trait feature from tests
pvdrz Apr 12, 2018
0efb567
dyn_trait feature-gate just for stage0
pvdrz Apr 12, 2018
55a653d
removed linting for dyn_trait
pvdrz Apr 13, 2018
4bf35f9
updated stderr files and removed feature-gate test for dyn_trait
pvdrz Apr 14, 2018
72a8eb9
fixed rustc version for dyn_trait
pvdrz Apr 15, 2018
cadf251
removed dyn trait attribute from librustdoc
pvdrz Apr 18, 2018
74412d2
fix search load page failure
GuillaumeGomez Apr 27, 2018
b80472d
fixed tests
pvdrz Apr 25, 2018
b5c7cbf
rustdoc asks for dyn_trait feature in stage0
pvdrz Apr 25, 2018
a18e7a6
Rollup merge of #49858 - dmizuk:unique-doc-hidden, r=steveklabnik
kennytm Apr 27, 2018
8b36d9a
Rollup merge of #49968 - christianpoveda:stabilize_dyn, r=nikomatsakis
kennytm Apr 27, 2018
4a961d1
Rollup merge of #50192 - bobtwinkles:libsyntax_extensions, r=jseyfried
kennytm Apr 27, 2018
1c1fd27
Rollup merge of #50251 - alexcrichton:wasm-no-threads, r=eddyb
kennytm Apr 27, 2018
0da4bde
Rollup merge of #50263 - alexcrichton:uwtable-allcoators, r=eddyb
kennytm Apr 27, 2018
28762ed
Rollup merge of #50269 - alexcrichton:update-parking-lot, r=Mark-Simu…
kennytm Apr 27, 2018
3f84ce2
Rollup merge of #50273 - Amanieu:issue-49532, r=alexcrichton
kennytm Apr 27, 2018
e598394
Rollup merge of #50284 - GuillaumeGomez:search-load-failure, r=SimonS…
kennytm Apr 27, 2018
dc6b167
Rollup merge of #50257 - estebank:fix-49560, r=nikomatsakis
kennytm Apr 27, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libproc_macro/lib.rs
Original file line number Diff line number Diff line change
@@ -270,7 +270,7 @@ impl Span {
/// `self` was generated from, if any.
#[unstable(feature = "proc_macro", issue = "38356")]
pub fn parent(&self) -> Option<Span> {
self.0.ctxt().outer().expn_info().map(|i| Span(i.call_site))
self.0.parent().map(|x| { Span(x) })
}

/// The span for the origin source code that `self` was generated from. If
6 changes: 6 additions & 0 deletions src/libsyntax_pos/lib.rs
Original file line number Diff line number Diff line change
@@ -291,6 +291,12 @@ impl Span {
self.ctxt().outer().expn_info().map(|info| info.call_site.source_callsite()).unwrap_or(self)
}

/// The `Span for the tokens in the previous macro expansion from which `self` was generated,
/// if any
pub fn parent(self) -> Option<Span> {
self.ctxt().outer().expn_info().map(|i| i.call_site)
}

/// Return the source callee.
///
/// Returns None if the supplied span has no expansion trace,