Fix mobile docs #54869

GuillaumeGomez · 2018-10-06T16:53:40Z

QuietMisdreavus · 2018-10-09T21:21:14Z

bors · 2018-10-09T21:21:15Z

📌 Commit ded0bf5 has been approved by QuietMisdreavus

@QuietMisdreavus

…uietMisdreavus Fix mobile docs Fixes rust-lang#54836. <img width="1440" alt="screen shot 2018-10-06 at 18 53 19" src="https://user-images.githubusercontent.com/3050060/46573683-1b4cd700-c999-11e8-9e6b-86a23b332e22.png"> r? @QuietMisdreavus

@QuietMisdreavus

…uietMisdreavus Fix mobile docs Fixes rust-lang#54836. <img width="1440" alt="screen shot 2018-10-06 at 18 53 19" src="https://user-images.githubusercontent.com/3050060/46573683-1b4cd700-c999-11e8-9e6b-86a23b332e22.png"> r? @QuietMisdreavus

@ghost

Rollup of 9 pull requests Successful merges: - #54747 (codegen_llvm: verify that inline assembly operands are scalars) - #54848 (Better Diagnostic for Trait Object Capture) - #54850 (Fix #54707 - parse_trait_item_ now handles interpolated blocks as function body decls) - #54858 (second round of refactorings for universes) - #54862 (Implement RFC 2539: cfg_attr with multiple attributes) - #54869 (Fix mobile docs) - #54870 (Stabilize tool lints) - #54893 (Fix internal compiler error on malformed match arm pattern.) - #54904 (Stabilize the `Option::replace` method) Failed merges: - #54909 ( Add chalk rules related to associated type defs) r? @ghost

@ghost

Rollup of 9 pull requests Successful merges: - #54747 (codegen_llvm: verify that inline assembly operands are scalars) - #54848 (Better Diagnostic for Trait Object Capture) - #54850 (Fix #54707 - parse_trait_item_ now handles interpolated blocks as function body decls) - #54858 (second round of refactorings for universes) - #54862 (Implement RFC 2539: cfg_attr with multiple attributes) - #54869 (Fix mobile docs) - #54870 (Stabilize tool lints) - #54893 (Fix internal compiler error on malformed match arm pattern.) - #54904 (Stabilize the `Option::replace` method) Failed merges: - #54909 ( Add chalk rules related to associated type defs) r? @ghost

bors · 2018-10-11T11:57:01Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout fix-mobile-docs (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self fix-mobile-docs --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: src/Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/librustdoc/html/static/rustdoc.css
Auto-merging src/Cargo.lock
CONFLICT (content): Merge conflict in src/Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

GuillaumeGomez · 2018-10-11T22:12:42Z

@bors: r=QuietMisdreavus

bors · 2018-10-11T22:12:43Z

📌 Commit c5a025a has been approved by QuietMisdreavus

bors · 2018-10-12T00:32:24Z

⌛ Testing commit c5a025a with merge 5de92bb87717df4c5bce1e1f1b24a4bee4417c42...

bors · 2018-10-12T01:14:18Z

💔 Test failed - status-travis

rust-highfive · 2018-10-12T01:14:20Z

The job x86_64-gnu-distcheck of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

/usr/local/lib/python2.7/dist-packages/pip/_vendor/requests/packages/urllib3/util/ssl_.py:122: InsecurePlatformWarning: A true SSLContext object is not available. This prevents urllib3 from configuring SSL appropriately and may cause certain SSL connections to fail. You can upgrade to a newer version of Python to solve this. For more information, see https://urllib3.readthedocs.io/en/latest/security.html#insecureplatformwarning.
  InsecurePlatformWarning
/usr/local/lib/python2.7/dist-packages/pip/_vendor/requests/packages/urllib3/util/ssl_.py:122: InsecurePlatformWarning: A true SSLContext object is not available. This prevents urllib3 from configuring SSL appropriately and may cause certain SSL connections to fail. You can upgrade to a newer version of Python to solve this. For more information, see https://urllib3.readthedocs.io/en/latest/security.html#insecureplatformwarning.
  InsecurePlatformWarning
  Downloading https://files.pythonhosted.org/packages/ac/12/38a00649e6d56d80aeee31dd42343d0795da92a7862b1af7b275f8979613/awscli-1.16.32-py2.py3-none-any.whl (1.4MB)
    0% |▎                               | 10kB 20.5MB/s eta 0:00:01
    1% |▌                               | 20kB 1.8MB/s eta 0:00:01
    2% |▊                               | 30kB 2.2MB/s eta 0:00:01
    3% |█                               | 40kB 2.0MB/s eta 0:00:01
---
[00:07:29]     Finished dev [unoptimized + debuginfo] target(s) in 1m 23s
[00:07:29]   Installing /cargo/bin/cargo-vendor
[00:07:29] warning: be sure to add `/cargo/bin` to your PATH to be able to run the installed binaries
[00:07:31]     Updating registry `https://github.com/rust-lang/crates.io-index`
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

GuillaumeGomez · 2018-10-12T08:27:32Z

@bors: retry

@QuietMisdreavus

…uietMisdreavus Fix mobile docs Fixes rust-lang#54836. <img width="1440" alt="screen shot 2018-10-06 at 18 53 19" src="https://user-images.githubusercontent.com/3050060/46573683-1b4cd700-c999-11e8-9e6b-86a23b332e22.png"> r? @QuietMisdreavus

@ghost

Rollup of 16 pull requests Successful merges: - #54755 (Documents reference equality by address (#54197)) - #54811 (During rustc bootstrap, make default for `optimize` independent of `debug`) - #54825 (NLL says "borrowed content" instead of more precise "dereference of raw pointer") - #54860 (Add doc comments about safest way to initialize a vector of zeros) - #54869 (Fix mobile docs) - #54891 (Fix tracking issue for Once::is_completed) - #54913 (doc fix: it's auto traits that make for automatic implementations) - #54920 (Fix handling of #[must_use] on unit and uninhabited types) - #54932 (A handful of random string-related improvements) - #54936 (impl Eq+Hash for TyLayout) - #54950 (std: Synchronize global allocator on wasm32) - #54956 ("(using ..." doesn't have the matching ")") - #54958 (add a macro for static (compile-time) assertions) - #54967 (Remove incorrect span for second label inner macro invocation) - #54983 (Fix slice's benchmarks) - #54989 (Fix spelling in the documentation to htmldocck.py) Failed merges: r? @ghost

rust-highfive assigned QuietMisdreavus Oct 6, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 6, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 9, 2018

pietroalbini mentioned this pull request Oct 9, 2018

Rollup of 14 pull requests #54944

Closed

pietroalbini mentioned this pull request Oct 10, 2018

Rollup of 12 pull requests #54953

Closed

Manishearth mentioned this pull request Oct 10, 2018

Rollup of 8 pull requests #54968

Closed

Manishearth mentioned this pull request Oct 10, 2018

Rollup of 9 pull requests #54969

Merged

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 11, 2018

GuillaumeGomez added 2 commits October 11, 2018 21:37

Update minifier version

ca517a6

Fix mobile doc display

c5a025a

GuillaumeGomez force-pushed the fix-mobile-docs branch from ded0bf5 to c5a025a Compare October 11, 2018 20:23

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 11, 2018

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 12, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 12, 2018

kennytm mentioned this pull request Oct 12, 2018

Rollup of 16 pull requests #55012

Merged

bors merged commit c5a025a into rust-lang:master Oct 12, 2018

GuillaumeGomez deleted the fix-mobile-docs branch October 13, 2018 12:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix mobile docs #54869

Fix mobile docs #54869

GuillaumeGomez commented Oct 6, 2018

QuietMisdreavus commented Oct 9, 2018

bors commented Oct 9, 2018

bors commented Oct 11, 2018

GuillaumeGomez commented Oct 11, 2018

bors commented Oct 11, 2018

bors commented Oct 12, 2018

bors commented Oct 12, 2018

rust-highfive commented Oct 12, 2018

GuillaumeGomez commented Oct 12, 2018

Fix mobile docs #54869

Fix mobile docs #54869

Conversation

GuillaumeGomez commented Oct 6, 2018

QuietMisdreavus commented Oct 9, 2018

bors commented Oct 9, 2018

bors commented Oct 11, 2018

GuillaumeGomez commented Oct 11, 2018

bors commented Oct 11, 2018

bors commented Oct 12, 2018

bors commented Oct 12, 2018

rust-highfive commented Oct 12, 2018

GuillaumeGomez commented Oct 12, 2018