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

Fixing a bunch of nightly fallouts #116

Merged
merged 4 commits into from Jul 25, 2014

Conversation

Projects
None yet
4 participants
@farcaller
Member

farcaller commented Jul 21, 2014

This fixes lifetimes broken by lifetime elision.

Cleaning up lifetimes is tracked in #115.

Also fixed rlib dependency tracker, an issue with broken PT if compiled with -O2. Libcore version is now matched to rustc version to prevent any compilation failures.

@farcaller farcaller added bug and removed bug labels Jul 21, 2014

@farcaller farcaller referenced this pull request Jul 21, 2014

Closed

Fix for latest rustc. #114

@farcaller

This comment has been minimized.

Member

farcaller commented Jul 23, 2014

r?

@bgamari

This comment has been minimized.

bgamari commented on src/hal/k20/uart.rs in e6eee41 Jul 23, 2014

r+

@farcaller

This comment has been minimized.

Owner

farcaller commented on e6eee41 Jul 23, 2014

r=bgamari

@hacknbot

This comment has been minimized.

Contributor

hacknbot commented on e6eee41 Jul 23, 2014

saw approval from bgamari
at farcaller@e6eee41

This comment has been minimized.

Contributor

hacknbot replied Jul 23, 2014

merging farcaller/zinc/fix-lifetimes = e6eee41 into auto

This comment has been minimized.

Contributor

hacknbot replied Jul 23, 2014

farcaller/zinc/fix-lifetimes = e6eee41 merged ok, testing candidate = 8abc4cd

This comment has been minimized.

Contributor

hacknbot replied Jul 23, 2014

hacknbot added a commit that referenced this pull request Jul 23, 2014

Merge pull request #116 from farcaller/fix-lifetimes
Fixed static lifetimes

Reviewed-by: bgamari
@bgamari

This comment has been minimized.

Contributor

bgamari commented Jul 23, 2014

@farcaller am I mistaken in thinking that bors expects approvals to be of the form r+ on the last commit?

@farcaller

This comment has been minimized.

Member

farcaller commented Jul 23, 2014

bors allows that only from collaborators. Fixed that for you and @errordeveloper ;-)

@farcaller

This comment has been minimized.

Member

farcaller commented Jul 23, 2014

Another one thing that I cannot reproduce, and this code doesn't even touch PT!

/home/travis/build/hackndev/zinc/apps/app_empty.rs:1:1: 1:1 error: expected node path but found `=`
/home/travis/build/hackndev/zinc/apps/app_empty.rs:1 #![feature(phase, asm)]
@farcaller

This comment has been minimized.

Member

farcaller commented Jul 23, 2014

Ok, so this is nightly fallout in nightly fallout fix. Looking into it...

@farcaller

This comment has been minimized.

Member

farcaller commented Jul 23, 2014

Breakage investigation so far:

parser's let ttsvec = tts.iter().map(|x| (*x).clone()).collect(); is broken, it produces a Vec, that somehow starts with EQ token for no apparent reason. Also you can't print that vec, as rustc SIGSEGVs.

Replaced with let ttsvec = Vec::from_slice(tts);.

Now, quote_expr! in system_clock_pt's materialiser is broken as well (guess what, exactly the same error, "unexpected token: ="!).

I have absolutely no idea, what's happening in there, filed rust-lang/rust#15931

@farcaller

This comment has been minimized.

Member

farcaller commented Jul 25, 2014

Did a bisect and small investigation, rust-lang/rust#15972.

@farcaller

This comment has been minimized.

Member

farcaller commented Jul 25, 2014

@farcaller

This comment has been minimized.

Member

farcaller commented Jul 25, 2014

r? 😄

@farcaller farcaller changed the title from Fixed static lifetimes to Fixing a bunch of nightly fallouts Jul 25, 2014

@farcaller

This comment has been minimized.

Owner

farcaller commented on db6ff40 Jul 25, 2014

r=bgamari

@hacknbot

This comment has been minimized.

Contributor

hacknbot commented on db6ff40 Jul 25, 2014

saw approval from bgamari
at farcaller@db6ff40

This comment has been minimized.

Contributor

hacknbot replied Jul 25, 2014

merging farcaller/zinc/fix-lifetimes = db6ff40 into auto

This comment has been minimized.

Contributor

hacknbot replied Jul 25, 2014

farcaller/zinc/fix-lifetimes = db6ff40 merged ok, testing candidate = 4c04075

This comment has been minimized.

Contributor

hacknbot replied Jul 25, 2014

This comment has been minimized.

Contributor

hacknbot replied Jul 25, 2014

fast-forwarding master to auto = 4c04075

hacknbot added a commit that referenced this pull request Jul 25, 2014

Merge pull request #116 from farcaller/fix-lifetimes
Fixing a bunch of nightly fallouts

Reviewed-by: bgamari
@@ -8,6 +8,8 @@ install:
- tar xf rust.tgz
- (cd ./rust-nightly-x86_64-unknown-linux-gnu/; sudo ./install.sh)
- export LD_LIBRARY_PATH=/usr/local/lib
- (mkdir -p ./thirdparty; cd ./thirdparty; git clone --depth 50 https://github.com/rust-lang/rust)
- "(cd ./thirdparty/rust; git checkout `rustc --version|awk '{sub(/\\(/, \"\", $3); print $3}'`)"

This comment has been minimized.

@errordeveloper

@hacknbot hacknbot merged commit db6ff40 into hackndev:master Jul 25, 2014

2 checks passed

continuous-integration/travis-ci The Travis CI build passed
Details
default all tests passed
Details

@farcaller farcaller referenced this pull request Jul 30, 2014

Merged

ioreg syntax extension #108

@farcaller farcaller deleted the farcaller:fix-lifetimes branch Aug 9, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment