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

Fix 13933 #14487

Merged
merged 2 commits into from
May 29, 2014
Merged

Fix 13933 #14487

merged 2 commits into from
May 29, 2014

Conversation

arielb1
Copy link
Contributor

@arielb1 arielb1 commented May 28, 2014

Fix issue #13933 in a few files. A more complete fix would require core::raw::MutSlice.


// A version of seek that takes &self so that tell can call it
// - the private seek should of course take &mut self.
fn _seek(&self, pos: i64, style: io::SeekStyle) -> Result<u64, IoError> {
Copy link
Member

Choose a reason for hiding this comment

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

I think the convention would be for something like seek_inner.

Copy link
Member

Choose a reason for hiding this comment

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

(Or seek_common like below.)

The IO libraries casted self to mut so they can pass it to seek(SEEK_CUR, 0).
Fix this by introducing a private seek function that takes &self
  - of course one should be careful with it if he lacks an
    exclusive reference to self.
@arielb1
Copy link
Contributor Author

arielb1 commented May 28, 2014

Improved indentation

@alexcrichton
Copy link
Member

I think that due to the last commit message, github may auto-close #13933, but there are still some FIXMEs associated with #13933, so could you tweak it to just reference #13933 instead of saying that it closes it?

directly use the internal pointer instead.
@arielb1
Copy link
Contributor Author

arielb1 commented May 28, 2014

Fixed. The rest of #13933 is waiting on #14484.

@arielb1
Copy link
Contributor Author

arielb1 commented May 28, 2014

I will do Arena and Slice in separate commits

bors added a commit that referenced this pull request May 29, 2014
Fix issue #13933 in a few files. A more complete fix would require core::raw::MutSlice.
@bors bors closed this May 29, 2014
@bors bors merged commit 2e8bc99 into rust-lang:master May 29, 2014
@arielb1 arielb1 deleted the fix-13933 branch October 12, 2014 17:45
@arielb1 arielb1 restored the fix-13933 branch October 12, 2014 17:45
@arielb1 arielb1 deleted the fix-13933 branch October 12, 2014 17:45
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 5, 2023
…=Veykril

fix: insert whitespace between text and pound

Because `text#`, `text"..."`, and `text'...'` are [reserved syntax since Rust 2021][guide]. Note that the latter two are already handled correctly.

Fixes rust-lang#14487

[guide]: https://doc.rust-lang.org/edition-guide/rust-2021/reserving-syntax.html
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants