Skip to content

rustup to rustc 1.17.0-nightly (60a0edc6c 2017-02-26) #147

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Mar 14, 2017
Merged

rustup to rustc 1.17.0-nightly (60a0edc6c 2017-02-26) #147

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8878a40
rustup to rustc 1.17.0-nightly (60a0edc6c 2017-02-26)
oli-obk Feb 28, 2017
8405770
Rustup to rustc 1.17.0-nightly (be760566c 2017-02-28)
oli-obk Mar 2, 2017
41d59b1
Rustup to rustc 1.17.0-nightly (b1e31766d 2017-03-03)
oli-obk Mar 7, 2017
4cb1f63
Rustup to rustc 1.17.0-nightly (824c9ebbd 2017-03-12)
oli-obk Mar 13, 2017
64d196a
Use deterministic keyword renaming (append `_`)
oli-obk Mar 14, 2017
da6f136
I say we take off and nuke the lifetimes from orbit
oli-obk Mar 14, 2017
adb3fbb
Add a method that hides the lifetime erasing boilerplate
oli-obk Mar 14, 2017
80be25e
Fix warnings in unit test
oli-obk Mar 14, 2017
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
4 changes: 2 additions & 2 deletions src/lvalue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
Local(mir::RETURN_POINTER) => self.frame().return_lvalue,
Local(local) => Lvalue::Local { frame: self.stack.len() - 1, local, field: None },

Static(def_id) => {
Static(ref statik) => {
Copy link
Contributor

@solson solson Mar 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/statik/static_/

I prefer to use a deterministic keyword renaming (append _) rather than coming up with weird unique replacements.

Copy link
Contributor Author

@oli-obk oli-obk Mar 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sgtm, I was just following the style seen in rustc (krate)

let substs = self.tcx.intern_substs(&[]);
Lvalue::Global(GlobalId { def_id, substs, promoted: None })
Lvalue::Global(GlobalId { def_id: statik.def_id, substs, promoted: None })
}

Projection(ref proj) => return self.eval_lvalue_projection(proj),
Expand Down
3 changes: 2 additions & 1 deletion src/step.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,8 @@ impl<'a, 'b, 'tcx> Visitor<'tcx> for ConstantExtractor<'a, 'b, 'tcx> {
location: mir::Location
) {
self.super_lvalue(lvalue, context, location);
if let mir::Lvalue::Static(def_id) = *lvalue {
if let mir::Lvalue::Static(ref statik) = *lvalue {
Copy link
Contributor

@solson solson Mar 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/statik/static_/

let def_id = statik.def_id;
let substs = self.ecx.tcx.intern_substs(&[]);
let span = self.span;
if let Some(node_item) = self.ecx.tcx.hir.get_if_local(def_id) {
Expand Down