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

Rollup of 5 pull requests #60888

Merged
merged 14 commits into from
May 17, 2019
Merged

Rollup of 5 pull requests #60888

merged 14 commits into from
May 17, 2019

Conversation

Manishearth
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

felixrabe and others added 14 commits April 23, 2019 20:27
The results aren't ideal but they represent the current state.
Outdent example, preserving nested fence
…eGomez

Document the `html_root_url` doc attribute value.

I'm not sure if this was intentionally not documented, but I think it would be good to include. This was added in rust-lang#9691.  `--extern-html-root-url` is unstable, but I don't think it hurts to mention it.
Do some simple constant propagation in the ConstProp pass

r? @oli-obk

I added a few test cases. Let me know if you think there should be more.
…pietroalbini

Update release notes for 1.35.0

(Applied remaining nit, rebased onto master, and added CVE link to the 1.34.2 release notes, as discussed in the release team meeting)

r? @pietroalbini
@Manishearth
Copy link
Member Author

@bors r+ p=3

@bors
Copy link
Contributor

bors commented May 16, 2019

📌 Commit b80a906 has been approved by Manishearth

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 16, 2019
@Centril
Copy link
Contributor

Centril commented May 16, 2019

@bors rollup=never

@bors
Copy link
Contributor

bors commented May 16, 2019

⌛ Testing commit b80a906 with merge 4f53b5c...

bors added a commit that referenced this pull request May 16, 2019
Rollup of 5 pull requests

Successful merges:

 - #60207 (Outdent example, preserving nested fence)
 - #60278 (Document the `html_root_url` doc attribute value.)
 - #60597 (Do some simple constant propagation in the ConstProp pass)
 - #60837 (Update release notes for 1.35.0)
 - #60887 (Update clippy)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented May 17, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Manishearth
Pushing 4f53b5c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 17, 2019
@bors bors merged commit b80a906 into rust-lang:master May 17, 2019
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
@Manishearth Manishearth deleted the rollup-oihtoyq branch June 22, 2020 18:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants