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

Rustup to rustc 1.36.0-nightly (1764b2972 2019-05-12) #4093

Merged
merged 5 commits into from
May 14, 2019
Merged

Rustup to rustc 1.36.0-nightly (1764b2972 2019-05-12) #4093

merged 5 commits into from
May 14, 2019

Conversation

Manishearth
Copy link
Member

No description provided.

@oli-obk
Copy link
Contributor

oli-obk commented May 13, 2019

I have time right now, want me to take over?

@mati865
Copy link
Contributor

mati865 commented May 13, 2019

Related PR rust-lang/rust#60630

@oli-obk
Copy link
Contributor

oli-obk commented May 13, 2019

It should be mostly paint by numbers by now (if not or unclear otherwise, just leave it for me for tomorrow).

If any symbol is missing, just add it to the list in utils::sym. If any string literal has a type error, change it to sym::string_content. If that's not possible because it's not a valid identifier, find a new name for it and use your_valid_identifier: "random string" in utils::sym, if you get weird type errors when using a symbol, you are probably missing a * (due to lazy static), so use *sym::foo everywhere. There's still one weird thing with a method that I didn't look too closely at (one of the hack methods with loads of collect calls in it). Also gazillions of unused imports, just remove them with rustfix in the end.

@Manishearth Manishearth force-pushed the rustup branch 13 times, most recently from 11edaef to 65c103d Compare May 14, 2019 01:33
@Manishearth
Copy link
Member Author

We have a problem, cross referential statics doesn't really work, you get lots of temporary lifetime issues.

Perhaps we can just manually initialize these with unsafe?

Also we should move all our usage of match_def_path over to just having a clippy::diagnostic::foobar tag on items in the stdlib.

@Manishearth
Copy link
Member Author

I think what we'll need to do is to reserve a nice block of a thousand symbol ids in rustc, and then have a proc macro generate them.

@Manishearth
Copy link
Member Author

I ... I just had a super devious idea. DefIds don't change for a given compiler, right?

We could totally add an intrinsic get_def_id::<T>() that gives you a DefId, and use that in match_def_path. Then we can just match_def_path::<Option>(def)

kinda prefer just annotating things, though.

@oli-obk
Copy link
Contributor

oli-obk commented May 14, 2019

@bors r+

@bors
Copy link
Contributor

bors commented May 14, 2019

📌 Commit dfbc74b has been approved by oli-obk

@bors
Copy link
Contributor

bors commented May 14, 2019

⌛ Testing commit dfbc74b with merge ad3269c...

bors added a commit that referenced this pull request May 14, 2019
Rustup to rustc 1.36.0-nightly (1764b29 2019-05-12)
@bors
Copy link
Contributor

bors commented May 14, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing ad3269c to master...

@bors bors merged commit dfbc74b into master May 14, 2019
@flip1995 flip1995 deleted the rustup branch May 14, 2019 09:35
@flip1995 flip1995 mentioned this pull request May 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants