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.

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

Jump to bottom

Add libgc_internal crate to core library #21

Merged
merged 2 commits into from
Dec 24, 2020
Merged

Add libgc_internal crate to core library #21

merged 2 commits into from
Dec 24, 2020

Conversation

jacob-hughes
Copy link
Collaborator

No description provided.

@ltratt
Copy link
Member

ltratt commented Dec 23, 2020

bors r+

@bors
Copy link

bors bot commented Dec 23, 2020

Build failed:

@jacob-hughes
Copy link
Collaborator Author

Rustc is quite particular about Cargo.lock, try this: 9850ee61666ebd2b07a140b1bee5d40eceb3b688

@ltratt
Copy link
Member

ltratt commented Dec 23, 2020

Please squash.

@jacob-hughes
Copy link
Collaborator Author

Squashed

@ltratt
Copy link
Member

ltratt commented Dec 23, 2020

bors r+

@bors
Copy link

bors bot commented Dec 23, 2020

Build failed:

@jacob-hughes jacob-hughes mentioned this pull request Dec 23, 2020
Merged
bors bot added a commit to softdevteam/libgc that referenced this pull request Dec 23, 2020
@bors @jacob-hughes
Merge #37
a5ad76b 
37: Borsify rustgc r=ltratt a=jacob-hughes

This adds test coverage for `--feature rustgc`. It can be merged once softdevteam/alloy#21 lands.

Co-authored-by: Jacob Hughes <jh@jakehughes.uk>
@jacob-hughes
Copy link
Collaborator Author

I've pushed a fix for this, but I think it works better as a separate commit so I won't squash it.

@ltratt
Copy link
Member

ltratt commented Dec 23, 2020

bors r+

@bors
Copy link

bors bot commented Dec 23, 2020

Build failed:

@jacob-hughes
Copy link
Collaborator Author

The license checker doesn't look for license files in the repo. I think it just checks for a license = line in Cargo.toml. I didn't know about this so I've added a PR here.

@ltratt
Copy link
Member

ltratt commented Dec 23, 2020

bors r+

@bors
Copy link

bors bot commented Dec 23, 2020

Build failed:

@jacob-hughes
Copy link
Collaborator Author

Fixed this, it will need squashing

bors try

@bors
Copy link

bors bot commented Dec 23, 2020

try

Build succeeded:

@jacob-hughes
Copy link
Collaborator Author

It builds! Let me know when I can squash

ltratt
ltratt reviewed Dec 23, 2020
View reviewed changes
src/tools/tidy/src/extdeps.rs
@@ -25,6 +25,12 @@ pub fn check(root: &Path, bad: &mut bool) {
// Extract source value.
let source = line.split_once('=').unwrap().1.trim();

// rustc only permits crates from crates.io so for now libgc_internal is
// hardcoded to pass the tidy checker.
if source.contains("softdevteam/libgc_internal") {
Copy link
Member

Choose a reason for hiding this comment

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

Can we make this ends_with or similar, just so that it's less likely to trigger incorrectly?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Unfortunately not. The actual sources list looks something like this:<metadata>softdevteam/libgc_internal<hash_which_changes_when_package_updates>

Copy link
Member

Choose a reason for hiding this comment

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

Ah, OK.

@ltratt
Copy link
Member

ltratt commented Dec 23, 2020

Please squash.

@jacob-hughes
Copy link
Collaborator Author

Squashed

@ltratt
Copy link
Member

ltratt commented Dec 23, 2020

bors r+

bors bot added a commit to softdevteam/libgc that referenced this pull request Dec 23, 2020
@bors @jacob-hughes
Merge #37
73aafc1 
37: Borsify rustgc r=ltratt a=jacob-hughes

This adds test coverage for `--feature rustgc`. It can be merged once softdevteam/alloy#21 lands.

Co-authored-by: Jacob Hughes <jh@jakehughes.uk>
@bors
Copy link

bors bot commented Dec 24, 2020

Timed out.

@ltratt
Copy link
Member

ltratt commented Dec 24, 2020

bors r+

@bors
Copy link

bors bot commented Dec 24, 2020

Build succeeded:

@bors bors bot merged commit 66211d9 into softdevteam:master Dec 24, 2020
bors bot added a commit that referenced this pull request Apr 29, 2021
@bors @jacob-hughes
Merge #21
7a647b3 
21: Bump |which| version to 4.0 r=ltratt a=jacob-hughes

Older versions use the deprecated |failure| library, which fails our
security audit (pun absolutely intended).

Co-authored-by: Jacob Hughes <jh@jakehughes.uk>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ltratt ltratt ltratt left review comments

Assignees

@ltratt ltratt

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jacob-hughes @ltratt