Skip to content

Miri subtree sync #2550

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

Closed
wants to merge 3 commits into from
Closed

Miri subtree sync #2550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cfd1b6
Ship fixed git-subtree script with miri
oli-obk Sep 19, 2022
b5f3383
Instructions for pushing a change
oli-obk Sep 19, 2022
8a8d94c
Address new lints triggering
oli-obk Sep 19, 2022
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
19 changes: 19 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,3 +275,22 @@ see <https://rustc-dev-guide.rust-lang.org/building/how-to-build-and-run.html>.

With this, you should now have a working development setup! See
[above](#building-and-testing-miri) for how to proceed working on Miri.

### Syncing the miri subrree

#### Updating from the rustc repo

One time setup:

Add your own miri fork as `miri-your-fork` to the rustc repo:

```
git remote add miri-your-fork [email protected]:your-name/miri.git
```

Every time:

```
ulimit -s 60000
Copy link
Member

Choose a reason for hiding this comment

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

Why do we need to change the stack size to run this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

because the script will segfault bash otherwise 😫 See also rust-lang/rust-clippy#5565 where all of this was figured out

Copy link
Member

Choose a reason for hiding this comment

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

Can't the script do this itself?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I didn't want to modify it ^^

src/tools/miri/git-subtree.sh push --prefix src/tools/miri/ miri-your-fork miri-subtree-sync
Copy link
Member

Choose a reason for hiding this comment

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

Needs to be updated since the script was removed

(also IMO the script should be in src/tools somewhere outside miri since it is just as useful for clippy)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yea, I'll put it in src/etc when the license stuff is clear

```
Loading