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

path suggestions in Rust 2018 should point out the change in semantics #55185

Merged
merged 1 commit into from Oct 28, 2018

Conversation

@davidtwco
Member

davidtwco commented Oct 18, 2018

Fixes #55130.

This commit extends existing path suggestions to link to documentation
on the changed semantics of use in Rust 2018.

r? @nikomatsakis

Show resolved Hide resolved src/librustc_resolve/error_reporting.rs Outdated
Show resolved Hide resolved src/librustc_resolve/resolve_imports.rs Outdated
@bors

This comment was marked as outdated.

Contributor

bors commented Oct 19, 2018

☔️ The latest upstream changes (presumably #55194) made this pull request unmergeable. Please resolve the merge conflicts.

@nikomatsakis

This comment has been minimized.

Contributor

nikomatsakis commented Oct 23, 2018

@bors r+

@bors

This comment has been minimized.

Contributor

bors commented Oct 23, 2018

📌 Commit d2baf92 has been approved by nikomatsakis

pietroalbini added a commit to pietroalbini/rust that referenced this pull request Oct 23, 2018

Rollup merge of rust-lang#55185 - davidtwco:issue-55130, r=nikomatsakis
path suggestions in Rust 2018 should point out the change in semantics

Fixes rust-lang#55130.

This commit extends existing path suggestions to link to documentation
on the changed semantics of `use` in Rust 2018.

r? @nikomatsakis

bors added a commit that referenced this pull request Oct 24, 2018

Auto merge of #55295 - pietroalbini:rollup, r=pietroalbini
Rollup of 19 pull requests

Successful merges:

 - #54125 (Less conservative uninhabitedness check)
 - #54626 (rustc: Tweak filenames encoded into metadata)
 - #54965 (update tcp stream documentation)
 - #55150 (Do not allow moving out of thread local under ast borrowck)
 - #55173 (Suggest appropriate syntax on missing lifetime specifier in return type)
 - #55185 (path suggestions in Rust 2018 should point out the change in semantics )
 - #55225 (Move cg_llvm:🔙:linker to cg_utils)
 - #55245 (submodules: update clippy from 5afdf8b7 to b1d03437)
 - #55247 (Clarified code example in char primitive doc)
 - #55251 (Fix a typo in the documentation of RangeInclusive)
 - #55253 (only issue "variant of the expected type" suggestion for enums)
 - #55254 (Correct trailing ellipsis in name_from_pat)
 - #55258 (Fix Rustdoc ICE when checking blanket impls)
 - #55262 (Change the ICE from #55223 to a hard error)
 - #55269 (fix typos in various places)
 - #55271 (Unimplement ExactSizeIterator for MIR traversing iterators)
 - #55282 (Remove redundant clone)
 - #55285 (Do some copy editing on the release notes)
 - #55291 (Update stdsimd submodule)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Oct 24, 2018

Auto merge of #55295 - pietroalbini:rollup, r=pietroalbini
Rollup of 19 pull requests

Successful merges:

 - #54125 (Less conservative uninhabitedness check)
 - #54626 (rustc: Tweak filenames encoded into metadata)
 - #54965 (update tcp stream documentation)
 - #55150 (Do not allow moving out of thread local under ast borrowck)
 - #55173 (Suggest appropriate syntax on missing lifetime specifier in return type)
 - #55185 (path suggestions in Rust 2018 should point out the change in semantics )
 - #55225 (Move cg_llvm:🔙:linker to cg_utils)
 - #55245 (submodules: update clippy from 5afdf8b7 to b1d03437)
 - #55247 (Clarified code example in char primitive doc)
 - #55251 (Fix a typo in the documentation of RangeInclusive)
 - #55253 (only issue "variant of the expected type" suggestion for enums)
 - #55254 (Correct trailing ellipsis in name_from_pat)
 - #55258 (Fix Rustdoc ICE when checking blanket impls)
 - #55262 (Change the ICE from #55223 to a hard error)
 - #55269 (fix typos in various places)
 - #55271 (Unimplement ExactSizeIterator for MIR traversing iterators)
 - #55282 (Remove redundant clone)
 - #55285 (Do some copy editing on the release notes)
 - #55291 (Update stdsimd submodule)

Failed merges:

r? @ghost
@bors

This comment was marked as resolved.

Contributor

bors commented Oct 25, 2018

☔️ The latest upstream changes (presumably #54658) made this pull request unmergeable. Please resolve the merge conflicts.

@davidtwco

This comment has been minimized.

Member

davidtwco commented Oct 25, 2018

@bors r=nikomatsakis

@bors

This comment has been minimized.

Contributor

bors commented Oct 25, 2018

📌 Commit ad0ac6a has been approved by nikomatsakis

@bors

This comment was marked as resolved.

Contributor

bors commented Oct 26, 2018

☔️ The latest upstream changes (presumably #54145) made this pull request unmergeable. Please resolve the merge conflicts.

@davidtwco

This comment has been minimized.

Member

davidtwco commented Oct 26, 2018

@bors r=nikomatsakis

@bors

This comment has been minimized.

Contributor

bors commented Oct 26, 2018

📌 Commit 8d5fb4c has been approved by nikomatsakis

@Mark-Simulacrum

This comment has been minimized.

Member

Mark-Simulacrum commented Oct 27, 2018

beta-nominating for RC2 inclusion; I think this would be nice to have though not critical

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Oct 27, 2018

Rollup merge of rust-lang#55185 - davidtwco:issue-55130, r=nikomatsakis
path suggestions in Rust 2018 should point out the change in semantics

Fixes rust-lang#55130.

This commit extends existing path suggestions to link to documentation
on the changed semantics of `use` in Rust 2018.

r? @nikomatsakis

bors added a commit that referenced this pull request Oct 27, 2018

Auto merge of #55425 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 13 pull requests

Successful merges:

 - #54683 (lint reasons (RFC 2883, part 1))
 - #54965 (update tcp stream documentation)
 - #55148 (Implement FromStr for PathBuf)
 - #55185 (path suggestions in Rust 2018 should point out the change in semantics )
 - #55252 (Add MaybeUninit::new)
 - #55257 (Allow extern statics with an extern type)
 - #55262 (Change the ICE from #55223 to a hard error)
 - #55269 (fix typos in various places)
 - #55330 (Add support for bound types)
 - #55349 (Move collect_and_partition_mono_items to rustc_mir)
 - #55389 (Remove unnecessary mut in iterator.find_map documentation example, R…)
 - #55406 (Update string.rs)
 - #55412 (Fix an ICE in the min_const_fn analysis)

Failed merges:

r? @ghost
@bors

This comment was marked as resolved.

Contributor

bors commented Oct 28, 2018

🔒 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:

  1. git checkout issue-55130 (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self issue-55130 --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
Auto-merging src/librustc_resolve/resolve_imports.rs
CONFLICT (content): Merge conflict in src/librustc_resolve/resolve_imports.rs
Auto-merging src/librustc_resolve/error_reporting.rs
CONFLICT (content): Merge conflict in src/librustc_resolve/error_reporting.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors

This comment was marked as resolved.

Contributor

bors commented Oct 28, 2018

☔️ The latest upstream changes (presumably #55297) made this pull request unmergeable. Please resolve the merge conflicts.

Add note linking to Rust 2018 path semantics docs.
This commit extends existing path suggestions to link to documentation
on the changed semantics of `use` in Rust 2018.
@davidtwco

This comment has been minimized.

Member

davidtwco commented Oct 28, 2018

@bors r=nikomatsakis

@bors

This comment has been minimized.

Contributor

bors commented Oct 28, 2018

📌 Commit 0d06b8c has been approved by nikomatsakis

kennytm added a commit to kennytm/rust that referenced this pull request Oct 28, 2018

Rollup merge of rust-lang#55185 - davidtwco:issue-55130, r=nikomatsakis
path suggestions in Rust 2018 should point out the change in semantics

Fixes rust-lang#55130.

This commit extends existing path suggestions to link to documentation
on the changed semantics of `use` in Rust 2018.

bors added a commit that referenced this pull request Oct 28, 2018

Auto merge of #55433 - kennytm:rollup, r=kennytm
Rollup of 11 pull requests

Successful merges:

 - #55148 (Implement FromStr for PathBuf)
 - #55185 (path suggestions in Rust 2018 should point out the change in semantics)
 - #55191 (Fix sub-variant doc display)
 - #55199 (Impl items have generics)
 - #55244 (Don't rerun MIR passes when inlining)
 - #55252 (Add MaybeUninit::new)
 - #55257 (Allow extern statics with an extern type)
 - #55389 (Remove unnecessary mut in iterator.find_map documentation example, R…)
 - #55406 (Update string.rs)
 - #55412 (Fix an ICE in the min_const_fn analysis)
 - #55421 (Add ManuallyDrop::take)

@bors bors merged commit 0d06b8c into rust-lang:master Oct 28, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@davidtwco davidtwco deleted the davidtwco:issue-55130 branch Oct 28, 2018

bors added a commit that referenced this pull request Oct 29, 2018

Auto merge of #55405 - alexcrichton:beta-next, r=Mark-Simulacrum
[beta]: Prepare the 1.31.0 beta release

* Update to Cargo's branched 1.31.0 branch
* Update the channel to `beta`

Rolled up beta-accepted PRs:

* #55297: Partial implementation of uniform paths 2.0 to land before beta
* #55192: Fix ordering of nested modules in non-mod.rs mods
* #55185: path suggestions in Rust 2018 should point out the change in semantics
* #55423: back out bogus `Ok`-wrapping suggestion on `?` arm type mismatch

Note that **this does not update the bootstrap compiler** due to #55404

bors added a commit that referenced this pull request Oct 29, 2018

Auto merge of #55405 - alexcrichton:beta-next, r=<try>
[beta]: Prepare the 1.31.0 beta release

* Update to Cargo's branched 1.31.0 branch
* Update the channel to `beta`

Rolled up beta-accepted PRs:

* #55362: Remove `cargo new --edition` from release notes.
* #55325: Fix link to macros chapter
* #55358: Remove redundant clone (2)
* #55346: Shrink `Statement`.
* #55274: Handle bindings in substructure of patterns with type ascriptions
* #55297: Partial implementation of uniform paths 2.0 to land before beta
* #55192: Fix ordering of nested modules in non-mod.rs mods
* #55185: path suggestions in Rust 2018 should point out the change in semantics
* #55423: back out bogus `Ok`-wrapping suggestion on `?` arm type mismatch

Note that **this does not update the bootstrap compiler** due to #55404

bors added a commit that referenced this pull request Oct 29, 2018

Auto merge of #55405 - alexcrichton:beta-next, r=pietroalbini
[beta]: Prepare the 1.31.0 beta release

* Update to Cargo's branched 1.31.0 branch
* Update the channel to `beta`

Rolled up beta-accepted PRs:

* #55362: Remove `cargo new --edition` from release notes.
* #55325: Fix link to macros chapter
* #55358: Remove redundant clone (2)
* #55346: Shrink `Statement`.
* #55274: Handle bindings in substructure of patterns with type ascriptions
* #55297: Partial implementation of uniform paths 2.0 to land before beta
* #55192: Fix ordering of nested modules in non-mod.rs mods
* #55185: path suggestions in Rust 2018 should point out the change in semantics
* #55423: back out bogus `Ok`-wrapping suggestion on `?` arm type mismatch

Note that **this does not update the bootstrap compiler** due to #55404

bors added a commit that referenced this pull request Oct 29, 2018

Auto merge of #55405 - alexcrichton:beta-next, r=pietroalbini
[beta]: Prepare the 1.31.0 beta release

* Update to Cargo's branched 1.31.0 branch
* Update the channel to `beta`

Rolled up beta-accepted PRs:

* #55362: Remove `cargo new --edition` from release notes.
* #55325: Fix link to macros chapter
* #55358: Remove redundant clone (2)
* #55346: Shrink `Statement`.
* #55274: Handle bindings in substructure of patterns with type ascriptions
* #55297: Partial implementation of uniform paths 2.0 to land before beta
* #55192: Fix ordering of nested modules in non-mod.rs mods
* #55185: path suggestions in Rust 2018 should point out the change in semantics
* #55423: back out bogus `Ok`-wrapping suggestion on `?` arm type mismatch

Note that **this does not update the bootstrap compiler** due to #55404
Some(
"`use` statements changed in Rust 2018; read more at \
<https://doc.rust-lang.org/edition-guide/rust-2018/module-system/path-\
clarity.html>".to_string()

This comment has been minimized.

@RalfJung

This comment has been minimized.

@steveklabnik

steveklabnik Nov 1, 2018

Member

yes, that URL isn't live yet, but will be as of the next release

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment