D6765: rustfilepatterns: shorter code for concatenating slices

2019-09-05 Thread valentin.gatienbaron (Valentin Gatien-Baron) 
Closed by commit rHG406bd21d363b: rustfilepatterns: shorter code for 
concatenating slices (authored by valentin.gatienbaron).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs 
Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6765?vs=16330=16385

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6765/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6765

AFFECTED FILES
  rust/hg-core/src/filepatterns.rs

CHANGE DETAILS

diff --git a/rust/hg-core/src/filepatterns.rs b/rust/hg-core/src/filepatterns.rs
--- a/rust/hg-core/src/filepatterns.rs
+++ b/rust/hg-core/src/filepatterns.rs
@@ -159,26 +159,20 @@
 if pattern[0] == b'^' {
 return pattern.to_owned();
 }
-let mut res = b".*".to_vec();
-res.extend(pattern);
-res
+[b".*", pattern].concat()
 }
 PatternSyntax::Path | PatternSyntax::RelPath => {
 if pattern == b"." {
 return vec![];
 }
-let mut pattern = escape_pattern(pattern);
-pattern.extend(b"(?:/|$)");
-pattern
+[escape_pattern(pattern).as_slice(), b"(?:/|$)"].concat()
 }
 PatternSyntax::RootFiles => {
 let mut res = if pattern == b"." {
 vec![]
 } else {
 // Pattern is a directory name.
-let mut as_vec: Vec = escape_pattern(pattern);
-as_vec.push(b'/');
-as_vec
+[escape_pattern(pattern).as_slice(), b"/"].concat()
 };
 
 // Anything after the pattern must be a non-directory.
@@ -186,24 +180,16 @@
 res
 }
 PatternSyntax::RelGlob => {
-let mut res: Vec = vec![];
 let glob_re = glob_to_re(pattern);
 if let Some(rest) = glob_re.drop_prefix(b"[^/]*") {
-res.extend(b".*");
-res.extend(rest);
+[b".*", rest, globsuffix].concat()
 } else {
-res.extend(b"(?:|.*/)");
-res.extend(glob_re);
+[b"(?:|.*/)", glob_re.as_slice(), globsuffix].concat()
 }
-res.extend(globsuffix.iter());
-res
 }
 PatternSyntax::Glob
 | PatternSyntax::RootGlob => {
-let mut res: Vec = vec![];
-res.extend(glob_to_re(pattern));
-res.extend(globsuffix.iter());
-res
+[glob_to_re(pattern).as_slice(), globsuffix].concat()
 }
 }
 }



To: valentin.gatienbaron, #hg-reviewers, Alphare, kevincox
Cc: durin42, kevincox, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6765: rustfilepatterns: shorter code for concatenating slices

2019-08-28 Thread valentin.gatienbaron (Valentin Gatien-Baron) 
valentin.gatienbaron added inline comments.
valentin.gatienbaron marked 2 inline comments as done.

INLINE COMMENTS

> kevincox wrote in filepatterns.rs:161
> For the other ones I think the problem is that it gets the element type from 
> the first element as ``. I think a better approach then creating the 
> wrapper function is doing `[vec.as_slice(), b"foobar"].concat()`.

I see. So the reason why the code above was accepted is because `pattern` was 
already a `&[u8]`, and not a ``. Thanks!

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6765/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6765

To: valentin.gatienbaron, #hg-reviewers, Alphare, kevincox
Cc: durin42, kevincox, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6765: rustfilepatterns: shorter code for concatenating slices

2019-08-28 Thread valentin.gatienbaron (Valentin Gatien-Baron) 
valentin.gatienbaron updated this revision to Diff 16330.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6765?vs=16328=16330

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6765/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6765

AFFECTED FILES
  rust/hg-core/src/filepatterns.rs

CHANGE DETAILS

diff --git a/rust/hg-core/src/filepatterns.rs b/rust/hg-core/src/filepatterns.rs
--- a/rust/hg-core/src/filepatterns.rs
+++ b/rust/hg-core/src/filepatterns.rs
@@ -158,26 +158,20 @@
 if pattern[0] == b'^' {
 return pattern.to_owned();
 }
-let mut res = b".*".to_vec();
-res.extend(pattern);
-res
+[b".*", pattern].concat()
 }
 PatternSyntax::Path | PatternSyntax::RelPath => {
 if pattern == b"." {
 return vec![];
 }
-let mut pattern = escape_pattern(pattern);
-pattern.extend(b"(?:/|$)");
-pattern
+[escape_pattern(pattern).as_slice(), b"(?:/|$)"].concat()
 }
 PatternSyntax::RootFiles => {
 let mut res = if pattern == b"." {
 vec![]
 } else {
 // Pattern is a directory name.
-let mut as_vec: Vec = escape_pattern(pattern);
-as_vec.push(b'/');
-as_vec
+[escape_pattern(pattern).as_slice(), b"/"].concat()
 };
 
 // Anything after the pattern must be a non-directory.
@@ -185,24 +179,16 @@
 res
 }
 PatternSyntax::RelGlob => {
-let mut res: Vec = vec![];
 let glob_re = glob_to_re(pattern);
 if let Some(rest) = glob_re.drop_prefix(b"[^/]*") {
-res.extend(b".*");
-res.extend(rest);
+[b".*", rest, globsuffix].concat()
 } else {
-res.extend(b"(?:|.*/)");
-res.extend(glob_re);
+[b"(?:|.*/)", glob_re.as_slice(), globsuffix].concat()
 }
-res.extend(globsuffix.iter());
-res
 }
 PatternSyntax::Glob
 | PatternSyntax::RootGlob => {
-let mut res: Vec = vec![];
-res.extend(glob_to_re(pattern));
-res.extend(globsuffix.iter());
-res
+[glob_to_re(pattern).as_slice(), globsuffix].concat()
 }
 }
 }



To: valentin.gatienbaron, #hg-reviewers, Alphare, kevincox
Cc: durin42, kevincox, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6765: rustfilepatterns: shorter code for concatenating slices

2019-08-28 Thread kevincox (Kevin Cox) 
kevincox added inline comments.

INLINE COMMENTS

> valentin.gatienbaron wrote in filepatterns.rs:161
> Indeed, although it took a compiler upgrade.
> I don't really understand why the compiler accepts the change here but not in 
> the other places. It seems a bit random to remove the borrow only here. What 
> do you think about the next commit? It would remove the `&_[..]` more 
> predictably.

For the other ones I think the problem is that it gets the element type from 
the first element as ``. I think a better approach then creating the 
wrapper function is doing `[vec.as_slice(), b"foobar"].concat()`.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6765/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6765

To: valentin.gatienbaron, #hg-reviewers, Alphare, kevincox
Cc: durin42, kevincox, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6765: rustfilepatterns: shorter code for concatenating slices

2019-08-28 Thread valentin.gatienbaron (Valentin Gatien-Baron) 
valentin.gatienbaron added inline comments.

INLINE COMMENTS

> kevincox wrote in filepatterns.rs:161
> I don't think you need the `&_[..]`. https://rust.godbolt.org/z/Wo-vza

Indeed, although it took a compiler upgrade.
I don't really understand why the compiler accepts the change here but not in 
the other places. It seems a bit random to remove the borrow only here. What do 
you think about the next commit? It would remove the `&_[..]` more predictably.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6765/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6765

To: valentin.gatienbaron, #hg-reviewers, Alphare, kevincox
Cc: durin42, kevincox, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6765: rustfilepatterns: shorter code for concatenating slices

2019-08-28 Thread valentin.gatienbaron (Valentin Gatien-Baron) 
valentin.gatienbaron updated this revision to Diff 16328.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6765?vs=16321=16328

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6765/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6765

AFFECTED FILES
  rust/hg-core/src/filepatterns.rs

CHANGE DETAILS

diff --git a/rust/hg-core/src/filepatterns.rs b/rust/hg-core/src/filepatterns.rs
--- a/rust/hg-core/src/filepatterns.rs
+++ b/rust/hg-core/src/filepatterns.rs
@@ -158,26 +158,20 @@
 if pattern[0] == b'^' {
 return pattern.to_owned();
 }
-let mut res = b".*".to_vec();
-res.extend(pattern);
-res
+[".*"[..], pattern].concat()
 }
 PatternSyntax::Path | PatternSyntax::RelPath => {
 if pattern == b"." {
 return vec![];
 }
-let mut pattern = escape_pattern(pattern);
-pattern.extend(b"(?:/|$)");
-pattern
+[_pattern(pattern), "(?:/|$)"[..]].concat()
 }
 PatternSyntax::RootFiles => {
 let mut res = if pattern == b"." {
 vec![]
 } else {
 // Pattern is a directory name.
-let mut as_vec: Vec = escape_pattern(pattern);
-as_vec.push(b'/');
-as_vec
+[_pattern(pattern), "/"[..]].concat()
 };
 
 // Anything after the pattern must be a non-directory.
@@ -185,24 +179,16 @@
 res
 }
 PatternSyntax::RelGlob => {
-let mut res: Vec = vec![];
 let glob_re = glob_to_re(pattern);
 if let Some(rest) = glob_re.drop_prefix(b"[^/]*") {
-res.extend(b".*");
-res.extend(rest);
+[".*"[..], rest, globsuffix].concat()
 } else {
-res.extend(b"(?:|.*/)");
-res.extend(glob_re);
+["(?:|.*/)"[..], _re, globsuffix].concat()
 }
-res.extend(globsuffix.iter());
-res
 }
 PatternSyntax::Glob
 | PatternSyntax::RootGlob => {
-let mut res: Vec = vec![];
-res.extend(glob_to_re(pattern));
-res.extend(globsuffix.iter());
-res
+[_to_re(pattern), globsuffix].concat()
 }
 }
 }



To: valentin.gatienbaron, #hg-reviewers, Alphare, kevincox
Cc: durin42, kevincox, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6765: rustfilepatterns: shorter code for concatenating slices

2019-08-28 Thread kevincox (Kevin Cox) 
kevincox added inline comments.
kevincox accepted this revision.

INLINE COMMENTS

> filepatterns.rs:161
>  }
> -let mut res = b".*".to_vec();
> -res.extend(pattern);
> -res
> +[".*"[..], pattern].concat()
>  }

I don't think you need the `&_[..]`. https://rust.godbolt.org/z/Wo-vza

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6765/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6765

To: valentin.gatienbaron, #hg-reviewers, Alphare, kevincox
Cc: durin42, kevincox, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6765: rustfilepatterns: shorter code for concatenating slices

2019-08-26 Thread valentin.gatienbaron (Valentin Gatien-Baron) 
valentin.gatienbaron updated this revision to Diff 16321.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6765?vs=16318=16321

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6765/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6765

AFFECTED FILES
  rust/hg-core/src/filepatterns.rs

CHANGE DETAILS

diff --git a/rust/hg-core/src/filepatterns.rs b/rust/hg-core/src/filepatterns.rs
--- a/rust/hg-core/src/filepatterns.rs
+++ b/rust/hg-core/src/filepatterns.rs
@@ -158,26 +158,20 @@
 if pattern[0] == b'^' {
 return pattern.to_owned();
 }
-let mut res = b".*".to_vec();
-res.extend(pattern);
-res
+[".*"[..], pattern].concat()
 }
 PatternSyntax::Path | PatternSyntax::RelPath => {
 if pattern == b"." {
 return vec![];
 }
-let mut pattern = escape_pattern(pattern);
-pattern.extend(b"(?:/|$)");
-pattern
+[_pattern(pattern), "(?:/|$)"[..]].concat()
 }
 PatternSyntax::RootFiles => {
 let mut res = if pattern == b"." {
 vec![]
 } else {
 // Pattern is a directory name.
-let mut as_vec: Vec = escape_pattern(pattern);
-as_vec.push(b'/');
-as_vec
+[_pattern(pattern), "/"[..]].concat()
 };
 
 // Anything after the pattern must be a non-directory.
@@ -185,24 +179,16 @@
 res
 }
 PatternSyntax::RelGlob => {
-let mut res: Vec = vec![];
 let glob_re = glob_to_re(pattern);
 if let Some(rest) = glob_re.chop_prefix(b"[^/]*") {
-res.extend(b".*");
-res.extend(rest);
+[".*"[..], rest, globsuffix].concat()
 } else {
-res.extend(b"(?:|.*/)");
-res.extend(glob_re);
+["(?:|.*/)"[..], _re, globsuffix].concat()
 }
-res.extend(globsuffix.iter());
-res
 }
 PatternSyntax::Glob
 | PatternSyntax::RootGlob => {
-let mut res: Vec = vec![];
-res.extend(glob_to_re(pattern));
-res.extend(globsuffix.iter());
-res
+[_to_re(pattern), globsuffix].concat()
 }
 }
 }



To: valentin.gatienbaron, #hg-reviewers, Alphare
Cc: durin42, kevincox, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6765: rustfilepatterns: shorter code for concatenating slices

2019-08-25 Thread valentin.gatienbaron (Valentin Gatien-Baron) 
valentin.gatienbaron created this revision.
Herald added subscribers: mercurial-devel, kevincox, durin42.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6765

AFFECTED FILES
  rust/hg-core/src/filepatterns.rs

CHANGE DETAILS

diff --git a/rust/hg-core/src/filepatterns.rs b/rust/hg-core/src/filepatterns.rs
--- a/rust/hg-core/src/filepatterns.rs
+++ b/rust/hg-core/src/filepatterns.rs
@@ -158,26 +158,20 @@
 if pattern[0] == b'^' {
 return pattern.to_owned();
 }
-let mut res = b".*".to_vec();
-res.extend(pattern);
-res
+[".*"[..], pattern].concat()
 }
 PatternSyntax::Path | PatternSyntax::RelPath => {
 if pattern == b"." {
 return vec![];
 }
-let mut pattern = escape_pattern(pattern);
-pattern.extend(b"(?:/|$)");
-pattern
+[_pattern(pattern), "(?:/|$)"[..]].concat()
 }
 PatternSyntax::RootFiles => {
 let mut res = if pattern == b"." {
 vec![]
 } else {
 // Pattern is a directory name.
-let mut as_vec: Vec = escape_pattern(pattern);
-as_vec.push(b'/');
-as_vec
+[_pattern(pattern), "/"[..]].concat()
 };
 
 // Anything after the pattern must be a non-directory.
@@ -185,24 +179,16 @@
 res
 }
 PatternSyntax::RelGlob => {
-let mut res: Vec = vec![];
 let glob_re = glob_to_re(pattern);
 if let Some(rest) = glob_re.chop_prefix(b"[^/]*") {
-res.extend(b".*");
-res.extend(rest);
+[".*"[..], rest, globsuffix].concat()
 } else {
-res.extend(b"(?:|.*/)");
-res.extend(glob_re);
+["(?:|.*/)"[..], _re, globsuffix].concat()
 }
-res.extend(globsuffix.iter());
-res
 }
 PatternSyntax::Glob
 | PatternSyntax::RootGlob => {
-let mut res: Vec = vec![];
-res.extend(glob_to_re(pattern));
-res.extend(globsuffix.iter());
-res
+[_to_re(pattern), globsuffix].concat()
 }
 }
 }



To: valentin.gatienbaron, #hg-reviewers
Cc: durin42, kevincox, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel