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

Name clash in star imports should result in error when the name is used #5963

Merged
merged 35 commits into from
May 11, 2024
Merged

Name clash in star imports should result in error when the name is used #5963

merged 35 commits into from
May 11, 2024

Commits on May 1, 2024

  1. Move name resolution to Root

    @jjcnn
    jjcnn committed May 1, 2024
    Configuration menu
    Copy the full SHA
    b01280a View commit details
    Browse the repository at this point in the history

  2. fmt, clippy

    @jjcnn
    jjcnn committed May 1, 2024
    Configuration menu
    Copy the full SHA
    a7510d9 View commit details
    Browse the repository at this point in the history

  3. Added tests of alias reexports, remove alias map from LexicalScope

    @jjcnn
    jjcnn committed May 1, 2024
    Configuration menu
    Copy the full SHA
    0856eb9 View commit details
    Browse the repository at this point in the history

  4. Added tests of alias reexports, remove alias map from LexicalScope

    @jjcnn
    jjcnn committed May 1, 2024
    Configuration menu
    Copy the full SHA
    070f884 View commit details
    Browse the repository at this point in the history

  5. Fix failing test

    @jjcnn
    jjcnn committed May 1, 2024
    Configuration menu
    Copy the full SHA
    0546ab6 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. Merge branch 'master' of github.com:FuelLabs/sway into jjcnn/name-cla… 

    …sh-on-star-imports
    @jjcnn
    jjcnn committed May 2, 2024
    Configuration menu
    Copy the full SHA
    b2bffcd View commit details
    Browse the repository at this point in the history

  2. EOD stash - still need to resolve test issues

    @jjcnn
    jjcnn committed May 2, 2024
    Configuration menu
    Copy the full SHA
    ce9fda8 View commit details
    Browse the repository at this point in the history

  3. Use TyDecl::eq instead of mod_path to determine if the same TyDecl ha… 

    …s been imported more than once
    @jjcnn
    jjcnn committed May 2, 2024
    Configuration menu
    Copy the full SHA
    179c948 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. Fixed tests

    @jjcnn
    jjcnn committed May 3, 2024
    Configuration menu
    Copy the full SHA
    869cad8 View commit details
    Browse the repository at this point in the history

  2. Updated test

    @jjcnn
    jjcnn committed May 3, 2024
    Configuration menu
    Copy the full SHA
    049e78e View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. Merge branch 'master' into jjcnn/name-clash-on-star-imports

    @jjcnn
    jjcnn committed May 6, 2024
    Configuration menu
    Copy the full SHA
    4f3989b View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. Fix module paths

    @jjcnn
    jjcnn committed May 7, 2024
    Configuration menu
    Copy the full SHA
    c1c9bbd View commit details
    Browse the repository at this point in the history

  2. Roll back changes to TyDecl::eq

    @jjcnn
    jjcnn committed May 7, 2024
    Configuration menu
    Copy the full SHA
    57a2bfc View commit details
    Browse the repository at this point in the history

  3. clippy, fmt

    @jjcnn
    jjcnn committed May 7, 2024
    Configuration menu
    Copy the full SHA
    d3175cd View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of github.com:FuelLabs/sway into jjcnn/name-cla… 

    …sh-on-star-imports
    @jjcnn
    jjcnn committed May 7, 2024
    Configuration menu
    Copy the full SHA
    636dc4c View commit details
    Browse the repository at this point in the history

  5. Change order of star-imported items

    @jjcnn
    jjcnn committed May 7, 2024
    Configuration menu
    Copy the full SHA
    0ccffc9 View commit details
    Browse the repository at this point in the history

  6. Revert order change of star-imported items

    @jjcnn
    jjcnn committed May 7, 2024
    Configuration menu
    Copy the full SHA
    6364b2f View commit details
    Browse the repository at this point in the history

  7. Allow bindings from std::prelude to override core::prelude and core::… 

    …codec
    @jjcnn
    jjcnn committed May 7, 2024
    Configuration menu
    Copy the full SHA
    93ea3cb View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. Updated test

    @jjcnn
    jjcnn committed May 8, 2024
    Configuration menu
    Copy the full SHA
    497e4dd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:FuelLabs/sway into jjcnn/name-cla… 

    …sh-on-star-imports
    @jjcnn
    jjcnn committed May 8, 2024
    Configuration menu
    Copy the full SHA
    068778e View commit details
    Browse the repository at this point in the history

  3. Move enum variant check back to TyDecl::eq

    @jjcnn
    jjcnn committed May 8, 2024
    Configuration menu
    Copy the full SHA
    a4b408d View commit details
    Browse the repository at this point in the history

  4. Code cleanup

    @jjcnn
    jjcnn committed May 8, 2024
    Configuration menu
    Copy the full SHA
    bcec129 View commit details
    Browse the repository at this point in the history

  5. Temporary save while switching machines

    @jjcnn
    jjcnn committed May 8, 2024
    Configuration menu
    Copy the full SHA
    c11b88d View commit details
    Browse the repository at this point in the history

  6. Workaround to deal with incorrect prelude reexports

    @jjcnn
    jjcnn committed May 8, 2024
    Configuration menu
    Copy the full SHA
    494cbf4 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of github.com:FuelLabs/sway into jjcnn/name-cla… 

    …sh-on-star-imports
    @jjcnn
    jjcnn committed May 8, 2024
    Configuration menu
    Copy the full SHA
    75b5f77 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. Merge branch 'master' into jjcnn/name-clash-on-star-imports

    @JoshuaBatty
    JoshuaBatty committed May 9, 2024
    Configuration menu
    Copy the full SHA
    4eb5ad0 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. Added implicit-std to tests

    @jjcnn
    jjcnn committed May 10, 2024
    Configuration menu
    Copy the full SHA
    8590ec1 View commit details
    Browse the repository at this point in the history

  2. Review comments addressed

    @jjcnn
    jjcnn committed May 10, 2024
    Configuration menu
    Copy the full SHA
    6b5ccc9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'jjcnn/name-clash-on-star-imports' of github.com:FuelLab… 

    …s/sway into jjcnn/name-clash-on-star-imports
    @jjcnn
    jjcnn committed May 10, 2024
    Configuration menu
    Copy the full SHA
    48fb955 View commit details
    Browse the repository at this point in the history

  4. Fixed unhelpful error message for enum variants, updated test

    @jjcnn
    jjcnn committed May 10, 2024
    Configuration menu
    Copy the full SHA
    c218e67 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into jjcnn/name-clash-on-star-imports

    @jjcnn
    jjcnn committed May 10, 2024
    Configuration menu
    Copy the full SHA
    fa6c794 View commit details
    Browse the repository at this point in the history

  6. clippy, fmt

    @jjcnn
    jjcnn committed May 10, 2024
    Configuration menu
    Copy the full SHA
    f44d4a8 View commit details
    Browse the repository at this point in the history

  7. Fixed clippy error

    @jjcnn
    jjcnn committed May 10, 2024
    Configuration menu
    Copy the full SHA
    9810f95 View commit details
    Browse the repository at this point in the history

  8. clippy complains again

    @jjcnn
    jjcnn committed May 10, 2024
    Configuration menu
    Copy the full SHA
    458e07c View commit details
    Browse the repository at this point in the history

Commits on May 11, 2024

  1. Merge branch 'master' into jjcnn/name-clash-on-star-imports

    @IGI-111
    IGI-111 committed May 11, 2024
    Configuration menu
    Copy the full SHA
    14dd040 View commit details
    Browse the repository at this point in the history